新增计曲线注记，修改整数高程点删除逻辑，以及其他修改

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/CMCgis_Basicfunction.cs

@@ -1803,91 +1803,117 @@ namespace HCTools
                     yy = yy - D6;
                 if(BLC!=5000)
                 {
-                    //if (i == strs.Length - 3)
-                    //{
-                    //    string[] str1 = strs[i].Split(' ');
-                    //    DBText text_fz1 = new DBText();
-                    //    text_fz1.TextString = str1[0];
-                    //    text_fz1.Position = new Point3d(xx, yy, 0);
-                    //    text_fz1.Height = D6;
-                    //    text_fz1.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
-                    //    text_fz1.Layer = layername;
-                    //    text_fz1.TextStyleId = HZ;
-                    //    text_fz1.WidthFactor = 0.8;
-                    //    if (BLC == 5000)
-                    //    {
-                    //        text_fz1.TextStyleId = st;
-                    //        text_fz1.WidthFactor = 1.375;
-                    //    }
-
-                    //    text_fz1.SetDatabaseDefaults();
-                    //    blocktablerecord.AppendEntity(text_fz1);
-                    //    traction.AddNewlyCreatedDBObject(text_fz1, true);
-
-                    //    xx = xx + D140 / 2 + D2;
-                    //    DBText text_fz2 = new DBText();
-                    //    text_fz2.TextString = str1[1] + " " + str1[2];
-                    //    text_fz2.Position = new Point3d(xx, yy, 0);
-                    //    text_fz2.Height = D6;
-                    //    text_fz2.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
-                    //    text_fz2.Layer = layername;
-                    //    text_fz2.TextStyleId = HZ;
-                    //    text_fz2.WidthFactor = 1;
-                    //    if (BLC == 5000)
-                    //    {
-                    //        text_fz2.TextStyleId = st;
-                    //        text_fz2.WidthFactor = 1.375;
-                    //    }
-                    //    text_fz2.SetDatabaseDefaults();
-                    //    blocktablerecord.AppendEntity(text_fz2);
-                    //    traction.AddNewlyCreatedDBObject(text_fz2, true);
-                    //    yy = yy - D4;
-
-                    //    continue;
-                    //}
-                    //else if (i == strs.Length - 2)
-                    //{
-                    //    string[] str2 = strs[i].Split(' ');
-                    //    DBText text_1 = new DBText();
-                    //    text_1.TextString = str2[0] + " " + str2[1] + " " + str2[2];
-                    //    text_1.Position = new Point3d(xx, yy, 0);
-                    //    text_1.Height = D6;
-                    //    text_1.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
-                    //    text_1.Layer = layername;
-                    //    text_1.TextStyleId = HZ;
-                    //    text_1.WidthFactor = 0.8;
-                    //    if (BLC == 5000)
-                    //    {
-                    //        text_1.TextStyleId = st;
-                    //        text_1.WidthFactor = 1.375;
-                    //    }
-
-                    //    text_1.SetDatabaseDefaults();
-                    //    blocktablerecord.AppendEntity(text_1);
-                    //    traction.AddNewlyCreatedDBObject(text_1, true);
-
-                    //    xx = xx + D90;
-                    //    DBText text_2 = new DBText();
-                    //    text_2.TextString = str2[3];
-                    //    text_2.Position = new Point3d(xx, yy, 0);
-                    //    text_2.Height = D6;
-                    //    text_2.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
-                    //    text_2.Layer = layername;
-                    //    text_2.TextStyleId = HZ;
-                    //    text_2.WidthFactor = 1;
-                    //    if (BLC == 5000)
-                    //    {
-                    //        text_2.TextStyleId = st;
-                    //        text_2.WidthFactor = 1.375;
-                    //    }
-                    //    text_2.SetDatabaseDefaults();
-                    //    blocktablerecord.AppendEntity(text_2);
-                    //    traction.AddNewlyCreatedDBObject(text_2, true);
-                    //    yy = yy - D4;
-
-                    //    continue;
-                    //}
+                    if (i == strs.Length - 3)
+                    {
+                        var strtochar = strs[i].ToCharArray();
+                        string[] str1 = new string[2];
+                        string split_str = "";
+                        for (int j = 0; j < strtochar.Length; j++)
+                        {
+                            if (strtochar[j] >= 0x4e00 && strtochar[j] <= 0x9fbb)
+                            {
+                                split_str = strtochar[j].ToString();
+                                str1 = strs[i].Split(strtochar[j]);
+                                break;
+                            }
+                        }
+                        //string[] str1 = strs[i].Split(' ');
+                        DBText text_fz1 = new DBText();
+                        text_fz1.TextString = str1[0];
+                        text_fz1.Position = new Point3d(xx, yy, 0);
+                        text_fz1.Height = D6;
+                        text_fz1.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
+                        text_fz1.Layer = layername;
+                        text_fz1.TextStyleId = HZ;
+                        text_fz1.WidthFactor = 0.8;
+                        if (BLC == 5000)
+                        {
+                            text_fz1.TextStyleId = st;
+                            text_fz1.WidthFactor = 1.375;
+                        }
+
+                        text_fz1.SetDatabaseDefaults();
+                        blocktablerecord.AppendEntity(text_fz1);
+                        traction.AddNewlyCreatedDBObject(text_fz1, true);
+
+                        xx = xx + D140 / 2 + D2;
+                        DBText text_fz2 = new DBText();
+                        //text_fz2.TextString = str1[1] + " " + str1[2];
+                        text_fz2.TextString = split_str.ToString() + str1[1];
+                        text_fz2.Position = new Point3d(xx, yy, 0);
+                        text_fz2.Height = D6;
+                        text_fz2.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
+                        text_fz2.Layer = layername;
+                        text_fz2.TextStyleId = HZ;
+                        text_fz2.WidthFactor = 1;
+                        if (BLC == 5000)
+                        {
+                            text_fz2.TextStyleId = st;
+                            text_fz2.WidthFactor = 1.375;
+                        }
+                        text_fz2.SetDatabaseDefaults();
+                        blocktablerecord.AppendEntity(text_fz2);
+                        traction.AddNewlyCreatedDBObject(text_fz2, true);
+                        yy = yy - D4;
 
+                        continue;
+                    }
+                    else if (i == strs.Length - 2)
+                    {
+                        //string[] str2 = strs[i].Split(' ');
+                        var strtochar = strs[i].ToCharArray();
+                        string[] str2 = new string[2];
+                        string split_str = "";
+                        for (int j = 0; j < strtochar.Length; j++)
+                        {
+                            if (strtochar[j] >= 0x4e00 && strtochar[j] <= 0x9fbb)
+                            {
+                                str2 = strs[i].Split(strtochar[j]);
+                                split_str = strtochar[j].ToString();
+                                break;
+                            }
+                        }
+                        DBText text_1 = new DBText();
+                        //text_1.TextString = str2[0] + " " + str2[1] + " " + str2[2];
+                        text_1.TextString = str2[0];
+                        text_1.Position = new Point3d(xx, yy, 0);
+                        text_1.Height = D6;
+                        text_1.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
+                        text_1.Layer = layername;
+                        text_1.TextStyleId = HZ;
+                        text_1.WidthFactor = 0.8;
+                        if (BLC == 5000)
+                        {
+                            text_1.TextStyleId = st;
+                            text_1.WidthFactor = 1.375;
+                        }
+
+                        text_1.SetDatabaseDefaults();
+                        blocktablerecord.AppendEntity(text_1);
+                        traction.AddNewlyCreatedDBObject(text_1, true);
+
+                        xx = xx + D90;
+                        DBText text_2 = new DBText();
+                        //text_2.TextString = str2[3];
+                        text_2.TextString = split_str + str2[1];
+                        text_2.Position = new Point3d(xx, yy, 0);
+                        text_2.Height = D6;
+                        text_2.Color = GrxCAD.Colors.Color.FromColorIndex(GrxCAD.Colors.ColorMethod.ByColor, 4);
+                        text_2.Layer = layername;
+                        text_2.TextStyleId = HZ;
+                        text_2.WidthFactor = 1;
+                        if (BLC == 5000)
+                        {
+                            text_2.TextStyleId = st;
+                            text_2.WidthFactor = 1.375;
+                        }
+                        text_2.SetDatabaseDefaults();
+                        blocktablerecord.AppendEntity(text_2);
+                        traction.AddNewlyCreatedDBObject(text_2, true);
+                        yy = yy - D4;
+
+                        continue;
+                    }
 
                     DBText text5 = new DBText();
                     text5.TextString = strs[i];

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/ChPLContradiction.cs

@@ -206,7 +206,6 @@ namespace HCTools
 
 
 
-
             //耗时
             watch.Stop();
             long times = watch.ElapsedMilliseconds;

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/GCDdelete_Form.Designer.cs

@@ -34,12 +34,14 @@ namespace HCTools
             this.button1 = new System.Windows.Forms.Button();
             this.label2 = new System.Windows.Forms.Label();
             this.comboBox_blc = new System.Windows.Forms.ComboBox();
+            this.textBox_dgj = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(52, 93);
+            this.label1.Location = new System.Drawing.Point(51, 85);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(127, 15);
             this.label1.TabIndex = 0;
@@ -48,14 +50,14 @@ namespace HCTools
             // comboBox1
             // 
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(185, 90);
+            this.comboBox1.Location = new System.Drawing.Point(184, 82);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(172, 23);
             this.comboBox1.TabIndex = 1;
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(176, 135);
+            this.button1.Location = new System.Drawing.Point(175, 181);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(67, 29);
             this.button1.TabIndex = 2;
@@ -85,11 +87,29 @@ namespace HCTools
             this.comboBox_blc.Size = new System.Drawing.Size(172, 23);
             this.comboBox_blc.TabIndex = 4;
             // 
+            // textBox_dgj
+            // 
+            this.textBox_dgj.Location = new System.Drawing.Point(185, 128);
+            this.textBox_dgj.Name = "textBox_dgj";
+            this.textBox_dgj.Size = new System.Drawing.Size(100, 25);
+            this.textBox_dgj.TabIndex = 5;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(118, 131);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(60, 15);
+            this.label3.TabIndex = 6;
+            this.label3.Text = "等高距:";
+            // 
             // GCDdelete_Form
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(427, 176);
+            this.ClientSize = new System.Drawing.Size(427, 237);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.textBox_dgj);
             this.Controls.Add(this.comboBox_blc);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.button1);
@@ -110,5 +130,7 @@ namespace HCTools
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.ComboBox comboBox_blc;
+        private System.Windows.Forms.TextBox textBox_dgj;
+        private System.Windows.Forms.Label label3;
     }
 }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/GCDdelete_Form.cs

@@ -65,7 +65,12 @@ namespace HCTools
             }
             if (comboBox_blc.Text == "")
             {
-                MessageBox.Show("请选择比例尺所在图层！");
+                MessageBox.Show("请选择比例尺！");
+                return;
+            }
+            if (textBox_dgj.Text == "")
+            {
+                MessageBox.Show("请输入等高距！");
                 return;
             }
             string blctext = comboBox_blc.Text;
@@ -74,10 +79,12 @@ namespace HCTools
             blc = Convert.ToInt32(strblc);
             lyr = comboBox1.Text;
             deletegcd();
+            this.Close();
         }
 
         private void deletegcd()
         {
+            double dgj = Convert.ToDouble(textBox_dgj.Text);
             Database db = GrxCAD.DatabaseServices.HostApplicationServices.WorkingDatabase;
             Editor ed = GrxCAD.ApplicationServices.Application.DocumentManager.MdiActiveDocument.Editor;
             //获取高程点
@@ -110,20 +117,21 @@ namespace HCTools
                         //找到实体获取并判断高程
                         Entity entity = (Entity)tran.GetObject(objid, OpenMode.ForWrite);
 
-                        if (entity is BlockReference)
+                        if (entity is DBText)
                         {
-                            BlockReference bref = (BlockReference)entity;
-                            double z = Math.Round(bref.Position.Z, 2, MidpointRounding.AwayFromZero);
+                            DBText bref = (DBText)entity;
+                            //double z = Math.Round(Convert.ToDouble(bref.TextString), 2, MidpointRounding.AwayFromZero);
+                            double z = Convert.ToDouble(bref.TextString);
                             //判断四舍五入后是否为整数
-                            if (Math.Truncate(z) == Math.Round(z, MidpointRounding.AwayFromZero))
+                            if (z % dgj == 0)
                             {
                                 bref.Layer = "整数值高程点";
-                                //获取高程点旁的高程标注
+                                //获取高程点
                                 Point3d p1 = new Point3d(bref.Position.X - 4 * blc / 2000, bref.Position.Y - 4 * blc / 2000, 0);
                                 Point3d p2 = new Point3d(bref.Position.X + 4 * blc / 2000, bref.Position.Y + 4 * blc / 2000, 0);
                                 TypedValue[] typedvalue1 = new TypedValue[2];
 
-                                typedvalue1.SetValue(new TypedValue((int)DxfCode.Start, "Text"), 0);
+                                typedvalue1.SetValue(new TypedValue((int)DxfCode.Start, "INSERT"), 0);
                                 typedvalue1.SetValue(new TypedValue((int)DxfCode.LayerName, lyr), 1);
 
                                 SelectionFilter filter1 = new SelectionFilter(typedvalue1);
@@ -133,16 +141,24 @@ namespace HCTools
                                 {
                                     SelectionSet ss = psr1.Value;
                                     ObjectId[] objids = new ObjectId[ss.Count];
-                                    objids = selectionset.GetObjectIds();
+                                    objids = ss.GetObjectIds();
                                     for (int ii = 0; ii < objids.Length; ii++)
                                     {
                                         ObjectId objid1 = objids[ii];
                                         Entity ent = (Entity)tran.GetObject(objid1, OpenMode.ForWrite);
-                                        if(ent is DBText)
+                                        if (ent is BlockReference)
                                         {
-                                            DBText txt = (DBText)ent;
-                                            if(Convert.ToDouble(txt.TextString)== Math.Round(bref.Position.Z, 2, MidpointRounding.AwayFromZero))
-                                                txt.Layer = "整数值高程点";
+                                            BlockReference pt = (BlockReference)ent;
+                                            int ws = 0;
+                                            if(bref.TextString.Contains('.'))
+                                            {
+                                                ws = bref.TextString.Split('.')[1].Length;
+                                                if (bref.TextString.Split('.')[1].All(c => c == '0'))
+                                                    ws = 0;
+                                            }
+                                            double ele = Math.Round(pt.Position.Z, ws, MidpointRounding.AwayFromZero);
+                                            if (z == ele)
+                                                pt.Layer = "整数值高程点";
                                         }
                                     }
                                 }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/HCTools.csproj

@@ -350,6 +350,12 @@
     </Compile>
     <Compile Include="MainClass.cs" />
     <Compile Include="Menus.cs" />
+    <Compile Include="MergeDwg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MergeDwg.Designer.cs">
+      <DependentUpon>MergeDwg.cs</DependentUpon>
+    </Compile>
     <Compile Include="ModifyTFH.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -462,6 +468,9 @@
     <EmbeddedResource Include="Layerchange_Form.resx">
       <DependentUpon>Layerchange_Form.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MergeDwg.resx">
+      <DependentUpon>MergeDwg.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ModifyTFH.resx">
       <DependentUpon>ModifyTFH.cs</DependentUpon>
     </EmbeddedResource>

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/InsertDOMs_to_one.Designer.cs

@@ -37,6 +37,7 @@ namespace HCTools
             this.button_dom = new System.Windows.Forms.Button();
             this.checkedListBox_dom = new System.Windows.Forms.CheckedListBox();
             this.button1 = new System.Windows.Forms.Button();
+            this.checkBox_selectAll = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // label1
@@ -94,7 +95,7 @@ namespace HCTools
             // checkedListBox_dom
             // 
             this.checkedListBox_dom.FormattingEnabled = true;
-            this.checkedListBox_dom.Location = new System.Drawing.Point(33, 145);
+            this.checkedListBox_dom.Location = new System.Drawing.Point(33, 164);
             this.checkedListBox_dom.Name = "checkedListBox_dom";
             this.checkedListBox_dom.Size = new System.Drawing.Size(424, 224);
             this.checkedListBox_dom.TabIndex = 6;
@@ -102,7 +103,7 @@ namespace HCTools
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(192, 385);
+            this.button1.Location = new System.Drawing.Point(192, 404);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(83, 36);
             this.button1.TabIndex = 7;
@@ -110,11 +111,23 @@ namespace HCTools
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // checkBox_selectAll
+            // 
+            this.checkBox_selectAll.AutoSize = true;
+            this.checkBox_selectAll.Location = new System.Drawing.Point(33, 139);
+            this.checkBox_selectAll.Name = "checkBox_selectAll";
+            this.checkBox_selectAll.Size = new System.Drawing.Size(59, 19);
+            this.checkBox_selectAll.TabIndex = 8;
+            this.checkBox_selectAll.Text = "全选";
+            this.checkBox_selectAll.UseVisualStyleBackColor = true;
+            this.checkBox_selectAll.CheckedChanged += new System.EventHandler(this.checkBox_selectAll_CheckedChanged);
+            // 
             // InsertDOMs_to_one
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(482, 447);
+            this.ClientSize = new System.Drawing.Size(482, 489);
+            this.Controls.Add(this.checkBox_selectAll);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.checkedListBox_dom);
             this.Controls.Add(this.button_dom);
@@ -140,5 +153,6 @@ namespace HCTools
         private System.Windows.Forms.Button button_dom;
         private System.Windows.Forms.CheckedListBox checkedListBox_dom;
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.CheckBox checkBox_selectAll;
     }
 }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/InsertDOMs_to_one.cs

@@ -96,7 +96,8 @@ namespace HCTools
                         InsertDOMs(tifpath, tfwpath, doc);
                     }
                 }
-
+                dynamic acadApp = GrxCAD.ApplicationServices.Application.AcadApplication;
+                acadApp.ZoomExtents();
                 //浩辰2020不能用doc.CloseandSave，它只能close不save
                 doc.Database.Save();
                 doc.CloseAndDiscard();
@@ -224,5 +225,13 @@ namespace HCTools
 
             }
         }
+
+        private void checkBox_selectAll_CheckedChanged(object sender, EventArgs e)
+        {
+            for (int i = 0; i < this.checkedListBox_dom.Items.Count; i++)
+            {
+                this.checkedListBox_dom.SetItemChecked(i, true);
+            }
+        }
     }
 }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/JQXLabel_grid.Designer.cs

@@ -110,6 +110,7 @@ namespace HCTools
             this.comboBox_blc.FormattingEnabled = true;
             this.comboBox_blc.Items.AddRange(new object[] {
             "1:500",
+            "1:1000",
             "1:2000",
             "1:5000",
             "1:10000"});

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/JQXLabel_grid.cs

@@ -22,6 +22,7 @@ namespace HCTools
             InitializeComponent();
         }
 
+        int nodirection = 0;
         private void JQXLabel_grid_Load(object sender, EventArgs e)
         {
             //自动填充下拉框
@@ -89,7 +90,7 @@ namespace HCTools
                 return;
             }
             jqxLabelbyGrid();
-            MessageBox.Show("标注完成。");
+            MessageBox.Show("标注完成。\n有"+nodirection.ToString()+ "处无法确定方向，移动到“无法确定方向”图层");
             this.Close();
         }
 
@@ -136,6 +137,10 @@ namespace HCTools
                 MessageBox.Show("未找到图框！");
                 return;
             }
+            //创建标记字体
+            CreateSheetMap cs = new CreateSheetMap();
+            cs.createTextStyle();
+            ObjectId HZ = cs.gettextstyleID("HZ");
             //遍历图框顶点列表，按顶点范围搜索等高线
             for (int i = 0; i < tkpts.Count; i++)
             {
@@ -163,40 +168,43 @@ namespace HCTools
                     SelectionSet ss = psr_pl.Value;
                     ObjectId[] plids = ss.GetObjectIds();
 
-                    List<Polyline> pllist = new List<Polyline>();
-                    for (int ii = 0; ii < plids.Length; ii++)
+                    List<Polyline> pllist = new List<Polyline>(); using (Transaction tr = db.TransactionManager.StartTransaction())
                     {
-                        using (Transaction tr = db.TransactionManager.StartTransaction())
+                        for (int ii = 0; ii < plids.Length; ii++)
                         {
+
                             Polyline pl = tr.GetObject(plids[ii], OpenMode.ForRead) as Polyline;
                             pllist.Add(pl);
-                            tr.Commit();
                         }
+                        tr.Commit();
                     }
 
                     //绘制图框
                     Polyline tk1 = new Polyline();
                     double width = tkpts[i][1].X - tkpts[i][0].X;
                     double height = tkpts[i][1].Y - tkpts[i][0].Y;
-                    tk1.AddVertexAt(0, new Point2d(tkpts[i][0].X, tkpts[i][0].Y), 0, 0, 0);
+                    tk1.AddVertexAt(0, new Point2d(tkpts[i][0].X, width), 0, 0, 0);
                     tk1.AddVertexAt(1, new Point2d(tkpts[i][0].X + width, tkpts[i][0].Y), 0, 0, 0);
                     tk1.AddVertexAt(2, new Point2d(tkpts[i][1].X, tkpts[i][1].Y), 0, 0, 0);
                     tk1.AddVertexAt(3, new Point2d(tkpts[i][0].X, tkpts[i][0].Y + height), 0, 0, 0);
                     tk1.Closed = true;
 
-                    var result = getPll(pllist,tk1);
-                    if (result.Count > 1)
-                    {
-                        Polyline merged = mergePl(result,tk1);
-                        makeMark(merged, db, tk1, blc);
-                    }
-                    else
-                        makeMark(result[0], db, tk1, blc);
+                    Point3d centralpt = new Point3d(tkpts[i][0].X + width / 2, tkpts[i][0].Y + height / 2, 0);
+                    var result = getPll(pllist,tk1, centralpt);
+                    //if (result.Count > 1)
+                    //{
+                        //Polyline merged = mergePl(result,tk1);
+                        //makeMark(merged, db, tk1, blc,centralpt);
+                        makeMark(result, db, blc,centralpt,HZ);
+                    //}
+                    //else
+                    //makeMark(result[0], db, tk1, blc, centralpt);
+                    pllist.Clear();
                 }
             }
         }
 
-        private List<Polyline> getPll(List<Polyline> pllist,Polyline tk)
+        private Polyline getPll(List<Polyline> pllist,Polyline tk,Point3d central)
         {
             var jqxlist = pllist.Where(pline => pline.Layer == comboBox_jqx.Text).ToList();
             var plllist_sorted = pllist.OrderBy(pline => pline.Elevation).ToList();
@@ -208,149 +216,270 @@ namespace HCTools
                 var sortedEle = jqxlist_groupbyele.Keys.OrderBy(e => e).ToList();
 
                 //获取图框内的多段线
-                var plinside = new List<Polyline>();
-                foreach (var item in jqxlist_groupbyele)
-                {
-                    foreach (var pl in item.Value)
-                    {
-                        var pls = GetPolylineInsideFrame(pl, tk);
-                        foreach (var l in pls)
-                        {
-                            plinside.Add(l);
-                        }
-                    }
-                }
+                //var plinside = new List<Polyline>();
+                //foreach (var item in jqxlist_groupbyele)
+                //{
+                //    foreach (var pl in item.Value)
+                //    {
+                //        var pls = GetPolylineInsideFrame(pl, tk);
+                //        foreach (var l in pls)
+                //        {
+                //            plinside.Add(l);
+                //        }
+                //    }
+                //}
                 //选择其中最长的高程组作为用于标记的高程线
-                var plinside_groupbyele = plinside.GroupBy(pline => pline.Elevation)
-                                    .ToDictionary(group => group.Key, group => group.ToList());
-                var result = plinside_groupbyele.OrderByDescending(g => g.Value.Sum(p => p.Length)).FirstOrDefault();
-                return result.Value;
+                //var plinside_groupbyele = plinside.GroupBy(pline => pline.Elevation)
+                //                    .ToDictionary(group => group.Key, group => group.ToList());
+                //var result = plinside_groupbyele.OrderByDescending(g => g.Value.Sum(p => p.Length)).FirstOrDefault();
+                Polyline labelpll = jqxlist.OrderBy(c => c.GetClosestPointTo(new Point3d(central.X,central.Y,c.Elevation), new Vector3d(0, 0, 1), false)
+                                            .DistanceTo(new Point3d(central.X, central.Y, c.Elevation))).First();
+                jqxlist.Clear();
+                return labelpll;
             }
             else
                 return null;
         }
 
-        private Polyline mergePl(List<Polyline> plllist, Polyline tk)
+        #region
+        //private Polyline mergePl(List<Polyline> plllist, Polyline tk)
+        //{
+        //    List<Polyline> interse = new List<Polyline>();
+        //    List<Polyline> result = new List<Polyline>(plllist);
+        //    for (int i = 0; i < plllist.Count - 1; i++)
+        //    {
+        //        Point3d start1 = plllist[i].GetPoint3dAt(0);
+        //        Point3d end1 = plllist[i].GetPoint3dAt(plllist[i].NumberOfVertices - 1);
+        //        for (int j = i + 1; j < plllist.Count; j++)
+        //        {
+        //            Point3d start2 = plllist[j].GetPoint3dAt(0);
+        //            Point3d end2 = plllist[j].GetPoint3dAt(plllist[j].NumberOfVertices - 1);
+        //            if (start1 == start2 || start1 == end2 || end1 == start2 || end1 == end2)
+        //            {
+        //                interse.Add(plllist[i]);
+        //                interse.Add(plllist[j]);
+        //                if (result.Contains(plllist[i])) result.Remove(plllist[i]);
+        //                if (result.Contains(plllist[j])) result.Remove(plllist[j]);
+        //            }
+        //        }
+        //    }
+        //    if (interse.Count > 0)
+        //    {
+        //        // 转换为NTS线串
+        //        var lineStrings = new List<Geometry>();
+        //        foreach (var pl in interse)
+        //        {
+        //            var lineString1 = ConvertPolylineToNtsGeometry(pl);
+        //            lineStrings.Add(lineString1);
+        //        }
+        //        // 使用线合并器
+        //        var merger = new LineMerger();
+        //        merger.Add(lineStrings);
+
+        //        // 获取合并结果
+        //        var mergedCollection = merger.GetMergedLineStrings();
+
+        //        // 转换回AutoCAD多段线
+        //        foreach (var geometry in mergedCollection)
+        //        {
+        //            if (geometry is LineString mergedLineString)
+        //            {
+        //                var mergedPolyline = ConvertNtsLineStringToPolyline(mergedLineString);
+        //                if (mergedPolyline != null)
+        //                {
+        //                    mergedPolyline.Elevation = plllist[0].Elevation;
+        //                    result.Add(mergedPolyline);
+        //                }
+        //            }
+        //        }
+        //    }
+        //    var plinside = new List<Polyline>();
+        //    foreach (var item in result)
+        //    {
+        //        var pls = GetPolylineInsideFrame(item, tk);
+        //        foreach (var l in pls)
+        //        {
+        //            plinside.Add(l);
+        //        }
+        //    }
+        //    return plinside.OrderByDescending(g => g.Length).First();
+        //}
+        #endregion
+
+        private void makeMark(Polyline pll,Database db, int blc,Point3d central, ObjectId HZ)
         {
-            List<Polyline> interse = new List<Polyline>();
-            List<Polyline> result = new List<Polyline>(plllist);
-            for (int i = 0; i < plllist.Count - 1; i++)
+            Editor ed = GrxCAD.ApplicationServices.Application.DocumentManager.MdiActiveDocument.Editor;
+            //var pllInside = GetPolylineInsideFrame(pll, tk);
+            Polyline labelpll = pll;
+            //Point3d label_pos = labelpll.GetPointAtDist(labelpll.Length / 2);
+
+            Point3d label_pos = labelpll.GetClosestPointTo(central, new Vector3d(0, 0, 1), false);
+            if (labelpll.StartPoint.X > labelpll.EndPoint.X)
+                labelpll.ReverseCurve();
+            //计算放置注记处的方向
+            Vector3d tangent = labelpll.GetFirstDerivative(labelpll.GetParameterAtPoint(label_pos));
+            double angle = tangent.GetAngleTo(Vector3d.XAxis);
+            //调整角度范围(0到2Π)
+            if (tangent.Y < 0)
+                angle = 2 * Math.PI - angle;
+            //法线向量
+            Vector3d normal = new Vector3d(-tangent.Y, tangent.X, 0);
+            //单位化
+            normal = normal.GetNormal();
+
+            List<Polyline> pllist = new List<Polyline>();
+            var angle1 = angle;
+            var angle2 = angle + Math.PI;
+            int flag = 0;
+            //以标注所在位置点为基点做基于该点的法线射线进行搜索
+            Point3d startPoint = label_pos;
+            Point3d endPoint = label_pos + normal * 200;
+            Point3dCollection ptcoll = new Point3dCollection() { startPoint, endPoint };
+
+            TypedValue[] typedvalue_pl = new TypedValue[2];
+            typedvalue_pl.SetValue(new TypedValue((int)DxfCode.LayerName, comboBox_jqx.Text+",8110"), 0);
+            typedvalue_pl.SetValue(new TypedValue((int)DxfCode.Start, "LWPOLYLINE"), 1);
+            SelectionFilter selectionfilter_pl = new SelectionFilter(typedvalue_pl);
+            PromptSelectionResult psr_pl = ed.SelectFence(ptcoll, selectionfilter_pl);
+            if (psr_pl.Status == PromptStatus.OK)
             {
-                Point3d start1 = plllist[i].GetPoint3dAt(0);
-                Point3d end1 = plllist[i].GetPoint3dAt(plllist[i].NumberOfVertices - 1);
-                for (int j = i + 1; j < plllist.Count; j++)
+                SelectionSet ss = psr_pl.Value;
+                ObjectId[] plids = ss.GetObjectIds();
+                using (Transaction tr = db.TransactionManager.StartTransaction())
                 {
-                    Point3d start2 = plllist[j].GetPoint3dAt(0);
-                    Point3d end2 = plllist[j].GetPoint3dAt(plllist[j].NumberOfVertices - 1);
-                    if (start1 == start2 || start1 == end2 || end1 == start2 || end1 == end2)
+                    for (int ii = 0; ii < plids.Length; ii++)
                     {
-                        interse.Add(plllist[i]);
-                        interse.Add(plllist[j]);
-                        if (result.Contains(plllist[i])) result.Remove(plllist[i]);
-                        if (result.Contains(plllist[j])) result.Remove(plllist[j]);
+
+                        Polyline dgx = tr.GetObject(plids[ii], OpenMode.ForRead) as Polyline;
+                        if (dgx.Elevation != pll.Elevation)
+                            pllist.Add(dgx);
                     }
+                    tr.Commit();
                 }
             }
-            if (interse.Count > 0)
+            if (pllist.Count == 0 || psr_pl.Status != PromptStatus.OK)
             {
-                // 转换为NTS线串
-                var lineStrings = new List<Geometry>();
-                foreach (var pl in interse)
+                flag = 1;
+                endPoint = label_pos - normal * 200;
+                ptcoll = new Point3dCollection() { startPoint, endPoint };
+                PromptSelectionResult psr_pl1 = ed.SelectFence(ptcoll, selectionfilter_pl);
+                if (psr_pl1.Status == PromptStatus.OK)
                 {
-                    var lineString1 = ConvertPolylineToNtsGeometry(pl);
-                    lineStrings.Add(lineString1);
-                }
-                // 使用线合并器
-                var merger = new LineMerger();
-                merger.Add(lineStrings);
-
-                // 获取合并结果
-                var mergedCollection = merger.GetMergedLineStrings();
-
-                // 转换回AutoCAD多段线
-                foreach (var geometry in mergedCollection)
-                {
-                    if (geometry is LineString mergedLineString)
+                    SelectionSet ss = psr_pl1.Value;
+                    ObjectId[] plids = ss.GetObjectIds();
+                    using (Transaction tr = db.TransactionManager.StartTransaction())
                     {
-                        var mergedPolyline = ConvertNtsLineStringToPolyline(mergedLineString);
-                        if (mergedPolyline != null)
+                        for (int ii = 0; ii < plids.Length; ii++)
                         {
-                            mergedPolyline.Elevation = plllist[0].Elevation;
-                            result.Add(mergedPolyline);
+
+                            Polyline dgx = tr.GetObject(plids[ii], OpenMode.ForRead) as Polyline;
+                            if (dgx.Elevation != pll.Elevation)
+                                pllist.Add(dgx);
                         }
+                        tr.Commit();
                     }
                 }
+                psr_pl1 = null;
             }
-            var plinside = new List<Polyline>();
-            foreach (var item in result)
+            if (pllist.Count != 0)
             {
-                var pls = GetPolylineInsideFrame(item, tk);
-                foreach (var l in pls)
-                {
-                    plinside.Add(l);
-                }
-            }
-            return plinside.OrderByDescending(g => g.Length).First();
-        }
+                Polyline closest = null;
+                double minDistance = double.MaxValue;
 
-        private void makeMark(Polyline pll,Database db, Polyline tk, int blc)
-        {
-            var pllInside = GetPolylineInsideFrame(pll, tk);
-            Polyline labelpll = pllInside.OrderByDescending(c => c.Length).First();
-            Point3d label_pos = labelpll.GetPointAtDist(labelpll.Length / 2);
-            if (labelpll.StartPoint.X > labelpll.EndPoint.X)
-                labelpll.ReverseCurve();
-            //计算放置注记处的方向
-            Vector3d tangent = labelpll.GetFirstDerivative(labelpll.GetParameterAtPoint(label_pos));
-            double angle = tangent.GetAngleTo(Vector3d.XAxis);
-            //调整角度范围(0到2Π)
-            if (tangent.Y < 0)
-                angle = 2 * Math.PI - angle;
+                foreach (Polyline dgx in pllist)
+                {
+                    // 直接计算距离，不使用中间Point3d对象
+                    Point3d closestPoint = dgx.GetClosestPointTo(label_pos, new Vector3d(0, 0, 1), false);
 
-            // 定义不允许的角度范围：90°到270°（向下方向）
-            double lowerBound = Math.PI / 2;  // 90°
-            double upperBound = 3 * Math.PI / 2;  // 270°
+                    // 避免创建新的Point3d对象
+                    double distance = Math.Sqrt(
+                        Math.Pow(closestPoint.X - label_pos.X, 2) +
+                        Math.Pow(closestPoint.Y - label_pos.Y, 2) +
+                        Math.Pow(dgx.Elevation - label_pos.Z, 2)
+                    );
 
-            // 如果角度在向下范围内，进行调整
-            if (angle > lowerBound && angle < upperBound)
-            {
-                // 翻转180度，使文字朝上
-                angle = angle + Math.PI;
+                    if (distance < minDistance)
+                    {
+                        minDistance = distance;
+                        closest = dgx;
+                    }
+                }
+                if (closest.Elevation < pll.Elevation && flag == 0 || closest.Elevation > pll.Elevation && flag == 1)
+                    angle = angle2;
+                closest.Dispose();
+                //1：2000字高4，以此为基础计算其他比例尺的字高
+                double labelheight = 4;
+                if (blc == 500)
+                    labelheight = labelheight * ((double)500 / 2000);
+                if (blc == 1000)
+                    labelheight = labelheight * ((double)1000 / 2000);
+                if (blc == 5000)
+                    labelheight = labelheight * ((double)5000 / 2000);
+                if (blc == 10000)
+                    labelheight = labelheight * ((double)10000 / 2000);
+
+                string ele = pll.Elevation.ToString();
+                using (Transaction tr = db.TransactionManager.StartTransaction())
+                {
+                    BlockTable bt = tr.GetObject(db.BlockTableId, OpenMode.ForWrite) as BlockTable;
+                    BlockTableRecord btr = tr.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForWrite) as BlockTableRecord;
+                    DBText ele_txt = new DBText();
+                    ele_txt.Height = labelheight;
+                    ele_txt.TextString = ele;
+                    ele_txt.TextStyleId = HZ;
+                    ele_txt.HorizontalMode = TextHorizontalMode.TextMid;
+                    ele_txt.Position = label_pos;
+                    ele_txt.AlignmentPoint = label_pos;
+                    ele_txt.Rotation = angle;
+                    ele_txt.Layer = comboBox_bz.Text;
+                    btr.AppendEntity(ele_txt);
+                    tr.AddNewlyCreatedDBObject(ele_txt, true);
+                    tr.Commit();
+                }
             }
-
-            //创建标记字体
-            CreateSheetMap cs = new CreateSheetMap();
-            cs.createTextStyle();
-            ObjectId HZ = cs.gettextstyleID("HZ");
-            //1：2000字高4，以此为基础计算其他比例尺的字高
-            double labelheight = 4;
-            if (blc == 500)
-                labelheight = labelheight * ((double)500 / 2000);
-            if (blc == 1000)
-                labelheight = labelheight * ((double)1000 / 2000);
-            if (blc == 5000)
-                labelheight = labelheight * ((double)5000 / 2000);
-            if (blc == 10000)
-                labelheight = labelheight * ((double)10000 / 2000);
-
-            string ele = pll.Elevation.ToString();
-            using (Transaction tr = db.TransactionManager.StartTransaction())
+            else
             {
-                BlockTable bt = tr.GetObject(db.BlockTableId, OpenMode.ForWrite) as BlockTable;
-                BlockTableRecord btr = tr.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForWrite) as BlockTableRecord;
-                DBText ele_txt = new DBText();
-                ele_txt.Height = labelheight;
-                ele_txt.TextString = ele;
-                ele_txt.TextStyleId = HZ;
-                ele_txt.HorizontalMode = TextHorizontalMode.TextMid;
-                ele_txt.Position = label_pos;
-                ele_txt.AlignmentPoint = label_pos;
-                ele_txt.Rotation = angle;
-                ele_txt.Layer = comboBox_bz.Text;
-                btr.AppendEntity(ele_txt);
-                tr.AddNewlyCreatedDBObject(ele_txt, true);
-                tr.Commit();
+                nodirection = nodirection + 1;
+                LayerControl layerscontrol = new LayerControl();
+                string layname = "无法判断方向";
+                if (layerscontrol.haslayername(layname) == false)
+                {
+                    colorgb col = new colorgb(255, 0, 0);
+                    layerscontrol.creatlayer(layname, col);
+                }
+                //1：2000字高4，以此为基础计算其他比例尺的字高
+                double labelheight = 4;
+                if (blc == 500)
+                    labelheight = labelheight * ((double)500 / 2000);
+                if (blc == 1000)
+                    labelheight = labelheight * ((double)1000 / 2000);
+                if (blc == 5000)
+                    labelheight = labelheight * ((double)5000 / 2000);
+                if (blc == 10000)
+                    labelheight = labelheight * ((double)10000 / 2000);
+
+                string ele = pll.Elevation.ToString();
+                using (Transaction tr = db.TransactionManager.StartTransaction())
+                {
+                    BlockTable bt = tr.GetObject(db.BlockTableId, OpenMode.ForWrite) as BlockTable;
+                    BlockTableRecord btr = tr.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForWrite) as BlockTableRecord;
+                    DBText ele_txt = new DBText();
+                    ele_txt.Height = labelheight;
+                    ele_txt.TextString = ele;
+                    ele_txt.TextStyleId = HZ;
+                    ele_txt.HorizontalMode = TextHorizontalMode.TextMid;
+                    ele_txt.Position = label_pos;
+                    ele_txt.AlignmentPoint = label_pos;
+                    ele_txt.Rotation = angle;
+                    ele_txt.Layer = "无法判断方向";
+                    btr.AppendEntity(ele_txt);
+                    tr.AddNewlyCreatedDBObject(ele_txt, true);
+                    tr.Commit();
+                }
+
             }
+            pllist.Clear();
+            psr_pl = null;
             #region
             //Polyline templine = pllist[0].Clone() as Polyline;
 
@@ -417,18 +546,20 @@ namespace HCTools
                         insidePolylines.Add(polyline);
                     }
                 }
-                else if (intersection is GeometryCollection collection)
-                {
-                    // 几何集合
-                    for (int i = 0; i < collection.NumGeometries; i++)
-                    {
-                        LineString segment = collection.GetGeometryN(i) as LineString;
-                        var polyline = ConvertNtsLineStringToPolyline(segment);
-                        polyline.Elevation = sourcePolyline.Elevation;
-                        insidePolylines.Add(polyline);
-                    }
-                }
+                //else if (intersection is GeometryCollection collection)
+                //{
+                //    // 几何集合
+                //    for (int i = 0; i < collection.NumGeometries; i++)
+                //    {
+                //        LineString segment = collection.GetGeometryN(i) as LineString;
+                //        var polyline = ConvertNtsLineStringToPolyline(segment);
+                //        polyline.Elevation = sourcePolyline.Elevation;
+                //        insidePolylines.Add(polyline);
+                //    }
+                //}
             }
+            ntsFrame = null;
+            ntsSource = null;
             return insidePolylines;
         }
 

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/MainClass.cs

@@ -668,5 +668,17 @@ namespace HCTools
                 form.Show();
             }
         }
+
+        //合并dwg
+        [CommandMethod("Mergedwg")]
+        public void Merge()
+        {
+            Verify();
+            if (num == 1)
+            {
+                MergeDwg form = new MergeDwg();
+                form.Show();
+            }
+        }
     }
 }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/Menus.cs

@@ -90,6 +90,8 @@ namespace HCTools
             pmi = pm.AddMenuItem(pm.Count + 1, "图层属性表", "Attribute ");
             pmi.HelpString = "图层属性表";
 
+            pmi = pm.AddMenuItem(pm.Count + 1, "合并同名dwg", "Mergedwg ");
+            pmi.HelpString = "合并同名dwg";
 
             //添加一个分隔条以区分不同类型的命令
             pm.AddSeparator(pm.Count + 1);

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/obj/Debug/HCTools.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f6ce5b89e9e52977c869c2a1f0489f8609d73c8f
+c31aaf052ba2e83d0fb50dea0dcb81eb2a13efb9

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/obj/Debug/HCTools.csproj.FileListAbsolute.txt

@@ -76,7 +76,6 @@ F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\b
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\bin\Debug\System.Memory.xml
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\bin\Debug\System.Numerics.Vectors.xml
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.csproj.AssemblyReference.cache
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.AttributeForm.resources
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.Chaginfos.resources
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.CheckL.resources
@@ -112,3 +111,4 @@ F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\o
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.dll
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.pdb
 F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.PtLinecontradiction.resources
+F:\daima\Tools\加密后软件工具\CAD插件工具\源代码\HCTools\HCTools\obj\Debug\HCTools.MergeDwg.resources