diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
index 535f691..3524086 100644
--- a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
+++ b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
@@ -293,9 +293,6 @@
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe.config
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.pdb
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
-D:\LSPipeline\obj\Debug\LSPipeline.exe
-D:\LSPipeline\obj\Debug\LSPipeline.pdb
 D:\LSPipeline\obj\Debug\WorldGIS.changeModelPathDlg.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAboutUs.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAddMultiModel.resources
@@ -431,8 +428,6 @@
 D:\LSPipeline\obj\Debug\WorldGIS.FrmBatchUpadateFontOfMarkers.resources
 D:\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe
-D:\LSPipeline\bin\x64\Debug\LSPipeline.pdb
 F:\predator\codeReview\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.exe
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.pdb
@@ -575,5 +570,9 @@
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
-D:\LSPipeline\obj\Debug\LSPipeline.csprojResolveAssemblyReference.cache
 D:\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe.config
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.pdb
+D:\LSPipeline\obj\Debug\Cyberpipe.exe
+D:\LSPipeline\obj\Debug\Cyberpipe.pdb

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
index 535f691..3524086 100644
--- a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
+++ b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
@@ -293,9 +293,6 @@
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe.config
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.pdb
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
-D:\LSPipeline\obj\Debug\LSPipeline.exe
-D:\LSPipeline\obj\Debug\LSPipeline.pdb
 D:\LSPipeline\obj\Debug\WorldGIS.changeModelPathDlg.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAboutUs.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAddMultiModel.resources
@@ -431,8 +428,6 @@
 D:\LSPipeline\obj\Debug\WorldGIS.FrmBatchUpadateFontOfMarkers.resources
 D:\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe
-D:\LSPipeline\bin\x64\Debug\LSPipeline.pdb
 F:\predator\codeReview\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.exe
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.pdb
@@ -575,5 +570,9 @@
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
-D:\LSPipeline\obj\Debug\LSPipeline.csprojResolveAssemblyReference.cache
 D:\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe.config
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.pdb
+D:\LSPipeline\obj\Debug\Cyberpipe.exe
+D:\LSPipeline\obj\Debug\Cyberpipe.pdb
diff --git a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
index fc30d84..2c9fa4c 100644
--- a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
+++ b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
index 535f691..3524086 100644
--- a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
+++ b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
@@ -293,9 +293,6 @@
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe.config
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.pdb
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
-D:\LSPipeline\obj\Debug\LSPipeline.exe
-D:\LSPipeline\obj\Debug\LSPipeline.pdb
 D:\LSPipeline\obj\Debug\WorldGIS.changeModelPathDlg.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAboutUs.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAddMultiModel.resources
@@ -431,8 +428,6 @@
 D:\LSPipeline\obj\Debug\WorldGIS.FrmBatchUpadateFontOfMarkers.resources
 D:\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe
-D:\LSPipeline\bin\x64\Debug\LSPipeline.pdb
 F:\predator\codeReview\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.exe
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.pdb
@@ -575,5 +570,9 @@
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
-D:\LSPipeline\obj\Debug\LSPipeline.csprojResolveAssemblyReference.cache
 D:\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe.config
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.pdb
+D:\LSPipeline\obj\Debug\Cyberpipe.exe
+D:\LSPipeline\obj\Debug\Cyberpipe.pdb
diff --git a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
index fc30d84..2c9fa4c 100644
--- a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
+++ b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache b/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 0febb5d..0000000
--- a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
index 535f691..3524086 100644
--- a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
+++ b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
@@ -293,9 +293,6 @@
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe.config
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.pdb
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
-D:\LSPipeline\obj\Debug\LSPipeline.exe
-D:\LSPipeline\obj\Debug\LSPipeline.pdb
 D:\LSPipeline\obj\Debug\WorldGIS.changeModelPathDlg.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAboutUs.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAddMultiModel.resources
@@ -431,8 +428,6 @@
 D:\LSPipeline\obj\Debug\WorldGIS.FrmBatchUpadateFontOfMarkers.resources
 D:\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe
-D:\LSPipeline\bin\x64\Debug\LSPipeline.pdb
 F:\predator\codeReview\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.exe
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.pdb
@@ -575,5 +570,9 @@
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
-D:\LSPipeline\obj\Debug\LSPipeline.csprojResolveAssemblyReference.cache
 D:\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe.config
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.pdb
+D:\LSPipeline\obj\Debug\Cyberpipe.exe
+D:\LSPipeline\obj\Debug\Cyberpipe.pdb
diff --git a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
index fc30d84..2c9fa4c 100644
--- a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
+++ b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache b/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 0febb5d..0000000
--- a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/obj/Debug/LSPipeline.exe b/obj/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/obj/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
index 535f691..3524086 100644
--- a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
+++ b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
@@ -293,9 +293,6 @@
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe.config
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.pdb
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
-D:\LSPipeline\obj\Debug\LSPipeline.exe
-D:\LSPipeline\obj\Debug\LSPipeline.pdb
 D:\LSPipeline\obj\Debug\WorldGIS.changeModelPathDlg.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAboutUs.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAddMultiModel.resources
@@ -431,8 +428,6 @@
 D:\LSPipeline\obj\Debug\WorldGIS.FrmBatchUpadateFontOfMarkers.resources
 D:\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe
-D:\LSPipeline\bin\x64\Debug\LSPipeline.pdb
 F:\predator\codeReview\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.exe
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.pdb
@@ -575,5 +570,9 @@
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
-D:\LSPipeline\obj\Debug\LSPipeline.csprojResolveAssemblyReference.cache
 D:\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe.config
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.pdb
+D:\LSPipeline\obj\Debug\Cyberpipe.exe
+D:\LSPipeline\obj\Debug\Cyberpipe.pdb
diff --git a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
index fc30d84..2c9fa4c 100644
--- a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
+++ b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache b/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 0febb5d..0000000
--- a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/obj/Debug/LSPipeline.exe b/obj/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/obj/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/obj/Debug/LSPipeline.pdb b/obj/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/obj/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ

diff --git a/FrmUnionFeatureDataset.cs b/FrmUnionFeatureDataset.cs
index 5227d8b..3ae2ccd 100644
--- a/FrmUnionFeatureDataset.cs
+++ b/FrmUnionFeatureDataset.cs
@@ -102,7 +102,8 @@
                          }
                          for (int i = 0; i < datasetInUnionDs1.FieldCount; i++)
                          {
-                             if (datasetInUnionDs1.GetField(i).Equals(datasetInUnionDs2.GetField(i)) == false)
+
+                             if (datasetInUnionDs1.GetField(i)==(datasetInUnionDs2.GetField(i)))
                              {
                                  MessageBox.Show("要合并的数据集结构不相同，无法合并！", "错误");
                                  return;
diff --git a/LSPipeline.csproj b/LSPipeline.csproj
index 599b492..a87266e 100644
--- a/LSPipeline.csproj
+++ b/LSPipeline.csproj
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorldGIS</RootNamespace>
-    <AssemblyName>LSPipeline</AssemblyName>
+    <AssemblyName>Cyberpipe</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>WorldGIS.ico</ApplicationIcon>
diff --git a/LSPipeline.suo b/LSPipeline.suo
index 2283fb0..7f52aa2 100644
--- a/LSPipeline.suo
+++ b/LSPipeline.suo
Binary files differ
diff --git a/MainFrm.Designer.cs b/MainFrm.Designer.cs
index 833882c..1101499 100644
--- a/MainFrm.Designer.cs
+++ b/MainFrm.Designer.cs
@@ -2288,7 +2288,7 @@
             this.面转为水面ToolStripMenuItem,
             this.ModelPathItem});
             this.layerNodeContexMenu.Name = "layerNodeContexMenu";
-            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 510);
+            this.layerNodeContexMenu.Size = new System.Drawing.Size(173, 488);
             // 
             // RefreshLayerFeatureListMenuItem
             // 
@@ -2952,7 +2952,7 @@
             this.KeyPreview = true;
             this.Name = "MainFrm";
             this.helpProvider1.SetShowHelp(this, true);
-            this.Text = "LSPipeline";
+            this.Text = "Cyberpipe";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.MainFrm_HelpButtonClicked);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFrm_FormClosing);
diff --git a/MainFrm.cs b/MainFrm.cs
index 69e4715..8209963 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -22,7 +22,7 @@
         GeoScene.Globe.GSOGlobeControl globeControl1;
         GeoScene.Engine.GSODataManager dataMananger1;
         String m_strWorkSpacePath = "";
-        String m_strFormTitle = "LSPipeline";
+        String m_strFormTitle = "Cyberpipe";
        
         GSOBalloon featureTooltip;
         GSOBalloon infoBalloon;
@@ -5179,7 +5179,7 @@
 
         private void 帮助ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Help.ShowHelp(this, Application.StartupPath + "/LSPipeline用户使用手册.chm");
+            Help.ShowHelp(this, Application.StartupPath + "/Cyberpipe用户使用手册.chm");
         }
 
         private void 管线高级查询ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/MainFrm.resx b/MainFrm.resx
index 308795d..7c6d812 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        IAAAAk1TRnQBSQFMAgEBCwEAATQBAQE0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        IAAAAk1TRnQBSQFMAgEBCwEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMB4AAzoBYAHsAcQBgQH/AewBxAGBAf8B7AHEAYEB/wHsAcQBgQH/AewBxAGB
         Af8B7AHEAYEB/wHsAcQBgQH/AewBxAGBAf8DRwGAHAADKgFABAADFwEgAyoBQAMqAUADIQEwBAADIQEw
         JAADDAEQA0oBjANcAfgDXwHzaAADIQEwA0cBgANHAYADXAHfAewBxAGBAf8B7AHEAYEB/wFiAlgB7wNH
diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.exe.config b/bin/x64/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe b/bin/x64/Debug/Cyberpipe.vshost.exe
new file mode 100644
index 0000000..6b241bc
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe
Binary files differ
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.config b/bin/x64/Debug/Cyberpipe.vshost.exe.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/Cyberpipe.vshost.exe.manifest b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x64/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git "a/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
new file mode 100644
index 0000000..52c561a
--- /dev/null
+++ "b/bin/x64/Debug/Cyberpipe\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/bin/x64/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.exe.config b/bin/x64/Debug/LSPipeline.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/bin/x64/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe b/bin/x64/Debug/LSPipeline.vshost.exe
deleted file mode 100644
index 6b241bc..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.config b/bin/x64/Debug/LSPipeline.vshost.exe.config
deleted file mode 100644
index e365603..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/bin/x64/Debug/LSPipeline.vshost.exe.manifest b/bin/x64/Debug/LSPipeline.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x64/Debug/LSPipeline.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm" "b/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
deleted file mode 100644
index 52c561a..0000000
--- "a/bin/x64/Debug/LSPipeline\347\224\250\346\210\267\344\275\277\347\224\250\346\211\213\345\206\214.chm"
+++ /dev/null
Binary files differ
diff --git a/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/debug/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/error/2017/201712/2017-12-05.log b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..f1e9f82
--- /dev/null
+++ b/bin/x64/Debug/log/error/2017/201712/2017-12-05.log
@@ -0,0 +1,6 @@
+[2017-12-05 17:11:48,213 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:11:52,053 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:25,182 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:12:27,947 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:20:18,405 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
+[2017-12-05 17:21:43,103 --  ERROR]  WorldGIS.HTForms.FrmAddWellShp.button3_Click:未将对象引用设置到对象的实例。
diff --git a/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/fatal/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/info/2017/201712/2017-12-05.log b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/info/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/x64/Debug/log/warn/2017/201712/2017-12-05.log
diff --git a/bin/x64/Debug/serverConfig.xml b/bin/x64/Debug/serverConfig.xml
index 22aeab0..8a47120 100644
--- a/bin/x64/Debug/serverConfig.xml
+++ b/bin/x64/Debug/serverConfig.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LocaSpace>
   <IsRecorded>False</IsRecorded>
-  <IP>127.0.0.1</IP>
+  <IP>192.168.0.203</IP>
   <Port>1500</Port>
-  <UserName>xyy</UserName>
-  <UserPwd>xyy</UserPwd>
+  <UserName>
+  </UserName>
+  <UserPwd>
+  </UserPwd>
 </LocaSpace>
\ No newline at end of file
diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe
new file mode 100644
index 0000000..8f5105c
--- /dev/null
+++ b/obj/Debug/Cyberpipe.exe
Binary files differ
diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb
new file mode 100644
index 0000000..8b090ec
--- /dev/null
+++ b/obj/Debug/Cyberpipe.pdb
Binary files differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b753066..d4938ec 100644
--- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
index 535f691..3524086 100644
--- a/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
+++ b/obj/Debug/LSPipeline.csproj.FileListAbsolute.txt
@@ -293,9 +293,6 @@
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe.config
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.exe
 D:\LSPipeline20150827\bin\x64\Debug\LSPipeline.pdb
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
-D:\LSPipeline\obj\Debug\LSPipeline.exe
-D:\LSPipeline\obj\Debug\LSPipeline.pdb
 D:\LSPipeline\obj\Debug\WorldGIS.changeModelPathDlg.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAboutUs.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmAddMultiModel.resources
@@ -431,8 +428,6 @@
 D:\LSPipeline\obj\Debug\WorldGIS.FrmBatchUpadateFontOfMarkers.resources
 D:\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 D:\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
-D:\LSPipeline\bin\x64\Debug\LSPipeline.exe
-D:\LSPipeline\bin\x64\Debug\LSPipeline.pdb
 F:\predator\codeReview\LSPipeline\bin\x64\Debug\LSPipeline.exe.config
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.exe
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.pdb
@@ -575,5 +570,9 @@
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.CtrlExtentSectionlineStyleSetting.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\WorldGIS.FrmDatabaseParaSettingOracle.resources
 F:\predator\codeReview\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
-D:\LSPipeline\obj\Debug\LSPipeline.csprojResolveAssemblyReference.cache
 D:\LSPipeline\obj\Debug\LSPipeline.csproj.GenerateResource.Cache
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe.config
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.exe
+D:\LSPipeline\bin\x64\Debug\Cyberpipe.pdb
+D:\LSPipeline\obj\Debug\Cyberpipe.exe
+D:\LSPipeline\obj\Debug\Cyberpipe.pdb
diff --git a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
index fc30d84..2c9fa4c 100644
--- a/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
+++ b/obj/Debug/LSPipeline.csproj.GenerateResource.Cache
Binary files differ
diff --git a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache b/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 0febb5d..0000000
--- a/obj/Debug/LSPipeline.csprojResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/obj/Debug/LSPipeline.exe b/obj/Debug/LSPipeline.exe
deleted file mode 100644
index ab3a8f2..0000000
--- a/obj/Debug/LSPipeline.exe
+++ /dev/null
Binary files differ
diff --git a/obj/Debug/LSPipeline.pdb b/obj/Debug/LSPipeline.pdb
deleted file mode 100644
index 75f5a53..0000000
--- a/obj/Debug/LSPipeline.pdb
+++ /dev/null
Binary files differ
diff --git a/obj/Debug/WorldGIS.MainFrm.resources b/obj/Debug/WorldGIS.MainFrm.resources
index d414f5d..f00f790 100644
--- a/obj/Debug/WorldGIS.MainFrm.resources
+++ b/obj/Debug/WorldGIS.MainFrm.resources
Binary files differ