修改自动输出图框和接图表替换

加密后软件工具/CAD插件工具/Thumbnail_HC/Thumbnail/Form1.Designer.cs

@@ -151,8 +151,7 @@
             "1:500",
             "1:1000",
             "1:2000",
-            "1:5000",
-            "1:10000"});
+            "1:5000"});
             this.comboBox_blc.Location = new System.Drawing.Point(207, 250);
             this.comboBox_blc.Name = "comboBox_blc";
             this.comboBox_blc.Size = new System.Drawing.Size(172, 23);

加密后软件工具/CAD插件工具/Thumbnail_HC/Thumbnail/getThumbnail.cs

@@ -66,6 +66,9 @@ namespace Thumbnail
                     ObjectIdCollection pllcoll = new ObjectIdCollection();
                     SelectionSet ss = psr.Value;
                     ObjectIdCollection idcoll1 = new ObjectIdCollection(ss.GetObjectIds());
+                    double searchlength = 250 * bl + 5.75 * bl * 2;
+                    if(bl==10)
+                        searchlength = 2595;
                     for (int i = 0; i < idcoll1.Count; i++)
                     {
                         using (Transaction trans = doc.Database.TransactionManager.StartTransaction())
@@ -74,13 +77,13 @@ namespace Thumbnail
                             if (ent is Polyline)
                             {
                                 Polyline pll = (Polyline)ent;
-                                if (pll.Length == 250 * bl + 5.75 * bl * 2 & pll.Closed == false)
+                                if (pll.Length == searchlength & pll.Closed == false)
                                     pllcoll.Add(idcoll1[i]);
                             }
                             if (ent is Polyline2d)
                             {
                                 Polyline2d pll = (Polyline2d)ent;
-                                if (pll.Length == 250 * bl + 5.75 * bl * 2 & pll.Closed == false)
+                                if (pll.Length == searchlength & pll.Closed == false)
                                     pllcoll.Add(idcoll1[i]);
                             }
                             trans.Commit();
@@ -96,7 +99,7 @@ namespace Thumbnail
                 getIntersecttk(tkinfolist, ptcoll, tf);
                 move(doc, tkinfolist, tf, ptcoll);
                 deletetk(doc, tkinfolist, tf);
-                ObjectId HZ= createTextStyle(doc);
+                ObjectId HZ = createTextStyle(doc);
                 draw(doc, ptcoll, tf, HZ);
                 if (tf.Count == 0 || tf == null)
                 {
@@ -126,7 +129,6 @@ namespace Thumbnail
                         }
                     }
                 }
-                //}
                 dynamic acadApp = GrxCAD.ApplicationServices.Application.AcadApplication;
                 acadApp.ZoomExtents();
                 doc.Database.SaveAs(savepath + "\\" + filename[filenum], true, DwgVersion.AC1024, doc.Database.SecurityParameters);
@@ -380,8 +382,10 @@ namespace Thumbnail
                                         foreach (Point3d temppt in tkinfolist[ii].ptcoll)
                                         {
                                             //筛选窗口内图幅
-                                            if (temppt.X > pt1.X && temppt.X < pt2.X &&
-                                                temppt.Y > pt1.Y && temppt.Y < pt2.Y)
+                                            if (Math.Round(temppt.X, 4) > Math.Round(pt1.X, 4) &&
+                                                Math.Round(temppt.X, 4) < Math.Round(pt2.X, 4) &&
+                                                Math.Round(temppt.Y, 4) > Math.Round(pt1.Y, 4) &&
+                                                Math.Round(temppt.Y, 4) < Math.Round(pt2.Y, 4))
                                             {
                                                 tkinfo pt = new tkinfo();
                                                 pt.id = tkinfolist[ii].id;
@@ -409,6 +413,11 @@ namespace Thumbnail
         {
             Point3d Frompt = new Point3d(ptcoll[0].X - (261.5 * bl - 5.75 * bl * 2), ptcoll[0].Y - (261.5 * bl - 5.75 * bl * 2), 0);//基点
             Point3d Topt = new Point3d(ptcoll[3].X, ptcoll[3].Y + 5.75 * bl + 1.75 * bl, 0);//目标点
+            if(bl==10)
+            {
+                Frompt = new Point3d(ptcoll[0].X - 2500, ptcoll[0].Y - 2500, 0);
+                Topt = new Point3d(ptcoll[3].X, ptcoll[3].Y + 48.75 + 15, 0);
+            }
             for (int i = 0; i < tf.Count; i++)
             {
                 for (int j = 0; j < tkinfolist.Count; j++)
@@ -471,6 +480,11 @@ namespace Thumbnail
             SelectionFilter filter_tfk = new SelectionFilter(value_tfk);
             Point3d pt1 = new Point3d(ptcoll[3].X, ptcoll[3].Y + 5.75 * bl + 1.75 * bl, 0);
             Point3d pt2 = new Point3d(ptcoll[3].X + 22.5 * bl, ptcoll[3].Y + (5.5 + 0.5 + 1.5) * bl + 12 * bl + 10, 0);
+            if (bl == 10)
+            {
+                pt1 = new Point3d(ptcoll[3].X, ptcoll[3].Y + 50, 0);
+                pt2 = new Point3d(ptcoll[3].X + 22.5 * bl, ptcoll[3].Y + 47.5 + 1.25 + 15 + 12 * bl, 0);
+            }
             //dynamic acadApp = GrxCAD.ApplicationServices.Application.AcadApplication;
             //acadApp.ZoomExtents();
             //using (DocumentLock docTargetLock = doc.LockDocument())
@@ -583,7 +597,7 @@ namespace Thumbnail
         /// <summary>
         /// 绘制接图表
         /// </summary>
-        private void draw(Document doc, Point3dCollection ptcoll, List<tkinfo> tf,ObjectId HZ)
+        private void draw(Document doc, Point3dCollection ptcoll, List<tkinfo> tf, ObjectId HZ)
         {
             Point2d p1 = new Point2d();
             Point2d p2 = new Point2d();
@@ -595,12 +609,21 @@ namespace Thumbnail
             double dist_w2jt = 1.75 * bl;  //外框到接图表距离
             double dist_tc = Math.Sqrt((0.5 * bl) * (0.5 * bl) * 2);
             double dist_tc1 = 0.404 * bl;
+            if (bl == 10)
+            {
+                dist_nw = 48.75;  //内外框距离
+                dist_w2jt = 15;  //外框到接图表距离
+                dist_tc = 7;
+                dist_tc1 = 0.349;
+            }
             List<tkinfo> zj_x = new List<tkinfo>();//只有x方向中间错位的图框
             List<tkinfo> zj_y = new List<tkinfo>();//只有y方向中间错位的图框
             //double cw_x = -9999;//错位图框左下角x坐标
             //double cw_y = -9999;//错位图框左下角y坐标
             Point3dCollection cw_x = new Point3dCollection();//x方向错位图框左下角点
             Point3dCollection cw_y = new Point3dCollection();//y方向错位图框左下角点
+            List<Polyline> x_addline = new List<Polyline>();
+            List<Polyline> y_addline = new List<Polyline>();
 
             using (Transaction trans = doc.Database.TransactionManager.StartTransaction())
             {
@@ -1399,6 +1422,7 @@ namespace Thumbnail
                                 pll_ad.SetDatabaseDefaults();
                                 btr.AppendEntity(pll_ad);
                                 tran.AddNewlyCreatedDBObject(pll_ad, true);
+                                x_addline.Add(pll_ad);
                                 //判断宽度能否放下文字
                                 DBText tfh_temp = tran.GetObject(tf[i].tfhid, OpenMode.ForWrite) as DBText;
                                 tfh_temp.TextStyleId = HZ;
@@ -1501,6 +1525,7 @@ namespace Thumbnail
                                 pll_ad.SetDatabaseDefaults();
                                 btr.AppendEntity(pll_ad);
                                 tran.AddNewlyCreatedDBObject(pll_ad, true);
+                                x_addline.Add(pll_ad);
                                 DBText tfh_temp = tran.GetObject(tf[i].tfhid, OpenMode.ForWrite) as DBText;
                                 tfh_temp.TextStyleId = HZ;
                                 tfh_temp.HorizontalMode = TextHorizontalMode.TextCenter;
@@ -1695,6 +1720,8 @@ namespace Thumbnail
                                 pll_cg_1.SetDatabaseDefaults();
                                 btr.AppendEntity(pll_cg_1);
                                 tran.AddNewlyCreatedDBObject(pll_cg_1, true);
+                                x_addline.Add(pll_cg);
+                                x_addline.Add(pll_cg_1);
                                 DBText tfh = tran.GetObject(tf[i].tfhid, OpenMode.ForWrite) as DBText;
                                 tfh.HorizontalMode = TextHorizontalMode.TextCenter;
                                 tfh.VerticalMode = TextVerticalMode.TextVerticalMid;
@@ -1761,6 +1788,7 @@ namespace Thumbnail
                                 pll_ad.SetDatabaseDefaults();
                                 btr.AppendEntity(pll_ad);
                                 tran.AddNewlyCreatedDBObject(pll_ad, true);
+                                y_addline.Add(pll_ad);
                                 //判断高度能否放下文字
                                 DBText tfh_temp = tran.GetObject(tf[i].tfhid, OpenMode.ForWrite) as DBText;
                                 tfh_temp.TextStyleId = HZ;
@@ -1862,6 +1890,7 @@ namespace Thumbnail
                                 pll_ad.SetDatabaseDefaults();
                                 btr.AppendEntity(pll_ad);
                                 tran.AddNewlyCreatedDBObject(pll_ad, true);
+                                y_addline.Add(pll_ad);
                                 //判断高度能否放下文字
                                 DBText tfh_temp = tran.GetObject(tf[i].tfhid, OpenMode.ForWrite) as DBText;
                                 tfh_temp.TextStyleId = HZ;
@@ -2058,6 +2087,8 @@ namespace Thumbnail
                                 pll_cg_2.SetDatabaseDefaults();
                                 btr.AppendEntity(pll_cg_2);
                                 tran.AddNewlyCreatedDBObject(pll_cg_2, true);
+                                y_addline.Add(pll_cg_1);
+                                y_addline.Add(pll_cg_2);
                                 DBText tfh = tran.GetObject(tf[i].tfhid, OpenMode.ForWrite) as DBText;
                                 tfh.HorizontalMode = TextHorizontalMode.TextCenter;
                                 tfh.VerticalMode = TextVerticalMode.TextVerticalMid;
@@ -2180,6 +2211,18 @@ namespace Thumbnail
                     tran.Commit();
                 }
             }
+
+            if (x_addline.Count != 0)
+            {
+                for (int i = 0; i < x_addline.Count; i++)
+                {
+                    Polyline pl = x_addline[i];
+                    if (pl.StartPoint.X == pl.EndPoint.X)
+                        ifneedaddline(pl, doc, dist_l, 0);
+                    else
+                        ifneedaddline(pl, doc, dist_w, 1);
+                }
+            }
         }
 
 
@@ -2394,9 +2437,173 @@ namespace Thumbnail
             }
         }
 
+
+        private void ifneedaddline(Polyline pl, Document doc, double length,int index)
+        {
+            bool flag1 = false;
+            bool flag2 = false;
+            length = length + 0.1;
+            Editor ed = GrxCAD.ApplicationServices.Application.DocumentManager.MdiActiveDocument.Editor;
+            if (index == 0)
+            {
+                double y = Math.Min(pl.StartPoint.Y, pl.EndPoint.Y) + Math.Abs(pl.StartPoint.Y - pl.EndPoint.Y) / 2;
+                Point3dCollection ptcol1 = new Point3dCollection();
+                ptcol1.Add(new Point3d(pl.StartPoint.X, y, 0));
+                ptcol1.Add(new Point3d(pl.StartPoint.X + length, y, 0));
+                Point3dCollection ptcol2 = new Point3dCollection();
+                ptcol2.Add(new Point3d(pl.StartPoint.X, y, 0));
+                ptcol2.Add(new Point3d(pl.StartPoint.X - length, y, 0));
+                TypedValue[] value = new TypedValue[]
+                {
+                     new TypedValue((int)DxfCode.LayerName,"9800"),
+                                new TypedValue((int)DxfCode.Start,"LWPOLYLINE,POLYLINE")
+                };
+                SelectionFilter filter = new SelectionFilter(value);
+                PromptSelectionResult psr1 = ed.SelectFence(ptcol1, filter);
+                PromptSelectionResult psr2 = ed.SelectFence(ptcol2, filter);
+                ObjectIdCollection idcoll1 = new ObjectIdCollection();
+                ObjectIdCollection idcoll2 = new ObjectIdCollection();
+                if (psr1.Status == PromptStatus.OK)
+                {
+                    SelectionSet ss = psr1.Value;
+                    idcoll1 = new ObjectIdCollection(ss.GetObjectIds());
+                }
+                if (psr2.Status == PromptStatus.OK)
+                {
+                    SelectionSet ss = psr2.Value;
+                    idcoll2 = new ObjectIdCollection(ss.GetObjectIds());
+                }
+                using (Transaction tran = doc.Database.TransactionManager.StartTransaction())
+                {
+                    BlockTable bt = (BlockTable)tran.GetObject(doc.Database.BlockTableId, OpenMode.ForRead);
+                    BlockTableRecord btr = (BlockTableRecord)tran.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForWrite);
+                    for (int i = 0; i < idcoll1.Count; i++)
+                    {
+                        Polyline neighbpl = tran.GetObject(idcoll1[i], OpenMode.ForRead) as Polyline;
+                        if (Math.Round(neighbpl.StartPoint.X, 4) == Math.Round(neighbpl.EndPoint.X, 4)&& idcoll1[i]!=pl.ObjectId)
+                        {
+                            flag1 = true;
+                            break;
+                        }
+                    }
+                    if(flag1==false)
+                    {
+                        Polyline ad_pl1 = new Polyline();
+                        ad_pl1.AddVertexAt(0, new Point2d(pl.StartPoint.X + length, pl.StartPoint.Y), 0, 0, 0);
+                        ad_pl1.AddVertexAt(1, new Point2d(pl.StartPoint.X + length, pl.EndPoint.Y), 0, 0, 0);
+                        ad_pl1.Layer = "9800";
+                        ad_pl1.Linetype = "Bylayer";
+                        ad_pl1.SetDatabaseDefaults();
+                        btr.AppendEntity(ad_pl1);
+                        tran.AddNewlyCreatedDBObject(ad_pl1, true);
+                    }
+                    for (int i = 0; i < idcoll2.Count; i++)
+                    {
+                        Polyline neighbpl = tran.GetObject(idcoll2[i], OpenMode.ForRead) as Polyline;
+                        if (Math.Round(neighbpl.StartPoint.X, 4) == Math.Round(neighbpl.EndPoint.X, 4) && idcoll2[i] != pl.ObjectId)
+                        {
+                            flag2 = true;
+                            break;
+                        }
+                    }
+                    if (flag2==false)
+                    {
+                        Polyline ad_pl2 = new Polyline();
+                        ad_pl2.AddVertexAt(0, new Point2d(pl.StartPoint.X - length, pl.StartPoint.Y), 0, 0, 0);
+                        ad_pl2.AddVertexAt(1, new Point2d(pl.StartPoint.X - length, pl.EndPoint.Y), 0, 0, 0);
+                        ad_pl2.Layer = "9800";
+                        ad_pl2.Linetype = "Bylayer";
+                        ad_pl2.SetDatabaseDefaults();
+                        btr.AppendEntity(ad_pl2);
+                        tran.AddNewlyCreatedDBObject(ad_pl2, true);
+                    }
+                    tran.Commit();
+                }
+            }
+            if (index == 1)
+            {
+                double x = Math.Min(pl.StartPoint.X, pl.EndPoint.X) + Math.Abs(pl.StartPoint.X - pl.EndPoint.X) / 2;
+                Point3dCollection ptcol1 = new Point3dCollection();
+                ptcol1.Add(new Point3d(x, pl.StartPoint.Y, 0));
+                ptcol1.Add(new Point3d(x, pl.StartPoint.Y + length, 0));
+                Point3dCollection ptcol2 = new Point3dCollection();
+                ptcol2.Add(new Point3d(x, pl.StartPoint.Y, 0));
+                ptcol2.Add(new Point3d(x, pl.StartPoint.Y - length, 0));
+                TypedValue[] value = new TypedValue[]
+                {
+                     new TypedValue((int)DxfCode.LayerName,"9800"),
+                                new TypedValue((int)DxfCode.Start,"LWPOLYLINE,POLYLINE")
+                };
+                SelectionFilter filter = new SelectionFilter(value);
+                PromptSelectionResult psr1 = ed.SelectFence(ptcol1, filter);
+                PromptSelectionResult psr2 = ed.SelectFence(ptcol2, filter);
+                ObjectIdCollection idcoll1 = new ObjectIdCollection();
+                ObjectIdCollection idcoll2 = new ObjectIdCollection();
+                if (psr1.Status == PromptStatus.OK)
+                {
+                    SelectionSet ss = psr1.Value;
+                    idcoll1 = new ObjectIdCollection(ss.GetObjectIds());
+                }
+                if (psr2.Status == PromptStatus.OK)
+                {
+                    SelectionSet ss = psr2.Value;
+                    idcoll2 = new ObjectIdCollection(ss.GetObjectIds());
+                }
+                using (Transaction tran = doc.Database.TransactionManager.StartTransaction())
+                {
+                    BlockTable bt = (BlockTable)tran.GetObject(doc.Database.BlockTableId, OpenMode.ForRead);
+                    BlockTableRecord btr = (BlockTableRecord)tran.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForWrite);
+                    for (int i = 0; i < idcoll1.Count; i++)
+                    {
+                        Polyline neighbpl = tran.GetObject(idcoll1[i], OpenMode.ForRead) as Polyline;
+                        if (Math.Round(neighbpl.StartPoint.Y, 4) == Math.Round(neighbpl.EndPoint.Y, 4) && idcoll1[i] != pl.ObjectId)
+                        {
+                            flag1 = true;
+                            break;
+                        }
+                    }
+                    if (flag1 == false)
+                    {
+                        Polyline ad_pl1 = new Polyline();
+                        ad_pl1.AddVertexAt(0, new Point2d(pl.StartPoint.X, pl.StartPoint.Y + length), 0, 0, 0);
+                        ad_pl1.AddVertexAt(1, new Point2d(pl.EndPoint.X, pl.EndPoint.Y + length), 0, 0, 0);
+                        ad_pl1.Layer = "9800";
+                        ad_pl1.Linetype = "Bylayer";
+                        ad_pl1.SetDatabaseDefaults();
+                        btr.AppendEntity(ad_pl1);
+                        tran.AddNewlyCreatedDBObject(ad_pl1, true);
+                    }
+                    for (int i = 0; i < idcoll2.Count; i++)
+                    {
+                        Polyline neighbpl = tran.GetObject(idcoll2[i], OpenMode.ForRead) as Polyline;
+                        if (Math.Round(neighbpl.StartPoint.Y, 4) == Math.Round(neighbpl.EndPoint.Y, 4) && idcoll2[i] != pl.ObjectId)
+                        {
+                            flag2 = true;
+                            break;
+                        }
+                    }
+                    if (flag2 == false)
+                    {
+                        Polyline ad_pl2 = new Polyline();
+                        ad_pl2.AddVertexAt(0, new Point2d(pl.StartPoint.X, pl.StartPoint.Y - length), 0, 0, 0);
+                        ad_pl2.AddVertexAt(1, new Point2d(pl.StartPoint.X, pl.EndPoint.Y - length), 0, 0, 0);
+                        ad_pl2.Layer = "9800";
+                        ad_pl2.Linetype = "Bylayer";
+                        ad_pl2.SetDatabaseDefaults();
+                        btr.AppendEntity(ad_pl2);
+                        tran.AddNewlyCreatedDBObject(ad_pl2, true);
+                    }
+                    tran.Commit();
+                }
+
+            }
+        }
+
+
+
         public ObjectId createTextStyle(Document doc)
         {
-            Database database = doc.Database; 
+            Database database = doc.Database;
             ObjectId textstyleID = new ObjectId();
             string stylename = "HZ";
             using (Transaction traction = database.TransactionManager.StartTransaction())
@@ -2427,7 +2634,7 @@ namespace Thumbnail
             }
             return textstyleID;
         }
-
     }
 }
 
+

加密后软件工具/CAD插件工具/Thumbnail_HC/Thumbnail/obj/Debug/Thumbnail.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-62f47f122ed5bba33de470ff262dff7385a93a56
+5beca6072c8a7f6b59f92a3dc32c31511abdb816

加密后软件工具/CAD插件工具/Thumbnail_HC/Thumbnail/obj/Debug/Thumbnail.csproj.FileListAbsolute.txt

@@ -34,3 +34,14 @@ F:\2022\2022-11\接图表替换\Thumbnail_HC\Thumbnail\bin\Debug\Thumbnail.dll
 F:\2022\2022-11\接图表替换\Thumbnail_HC\Thumbnail\bin\Debug\Thumbnail.pdb
 F:\2022\2022-11\接图表替换\Thumbnail_HC\Thumbnail\bin\Debug\Thumbnail.dll.config
 F:\2022\2022-11\接图表替换\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.csproj.AssemblyReference.cache
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\bin\Debug\Thumbnail.dll.config
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\bin\Debug\Thumbnail.dll
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\bin\Debug\Thumbnail.pdb
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\bin\Debug\gmap.dll
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\bin\Debug\gmdb.dll
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.Form1.resources
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.csproj.GenerateResource.cache
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.csproj.CoreCompileInputs.cache
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.csproj.CopyComplete
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.dll
+F:\daima\Tools\加密后软件工具\CAD插件工具\Thumbnail_HC\Thumbnail\obj\Debug\Thumbnail.pdb

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

@@ -54,6 +54,9 @@ xxxx年xx月测制</value>
       <setting name="FCY" serializeAs="String">
         <value>复查员 </value>
       </setting>
+      <setting name="Company" serializeAs="String">
+        <value>四川中水成勘院测绘工程有限责任公司</value>
+      </setting>
     </HCTools.Properties.Settings>
   </userSettings>
 </configuration>

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

@@ -3,6 +3,7 @@ using GrxCAD.EditorInput;
 using GrxCAD.Geometry;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -13,7 +14,7 @@ namespace HCTools
     // 存储交点和对应等高线的数据结构
     class IntersectionResult
     {
-        public Point3dCollection IntersectionPoint { get; set; }
+        public List<Point3d> IntersectionPoint { get; set; }
         public Polyline Contour { get; set; }
 
     }
@@ -24,12 +25,15 @@ namespace HCTools
         public static string jqx;//计曲线
         public static int dgj;//计曲线
         public static string elevationLayer;//高程点图层名
+        public static int num = 0;//点线矛盾点数量
         int looptimes = 5;//循环查找次数
 
+
         public void Check()
         {
             Editor ed = GrxCAD.ApplicationServices.Application.DocumentManager.MdiActiveDocument.Editor;
             Database db = GrxCAD.ApplicationServices.Application.DocumentManager.MdiActiveDocument.Database;
+            num = 0;
 
             var ptlist = GetPt(ed, db);
             for (int i = 0; i < ptlist.Count; i++)
@@ -37,10 +41,10 @@ namespace HCTools
                 BlockReference bf = ptlist[i];
                 //为方便搜索操作，将待检查高程点设置为当前视图的中心点，视图高设置为600
                 SetWindow(ed, db, bf.Position.X, bf.Position.Y, 600, 600);
-                bool contradition = false;
+                bool contradition = true;
                 for (int j = 0; j < looptimes; j++)
                 {
-                    double searchlength = 50.0 * (looptimes + 1);
+                    double searchlength = 100.0 * (j + 1);
                     var searchpl_horizontal = SearchDGX(bf.Position, searchlength, ed, db, 0);
                     var searchpl_vertical = SearchDGX(bf.Position, searchlength, ed, db, 1);
                     List<Polyline> all_pl = new List<Polyline>();
@@ -60,6 +64,7 @@ namespace HCTools
                 }
                 if (contradition)
                 {
+                    num++;
                     MakeFlag(bf.Position, blc);
 
                     Point3d p1 = new Point3d(bf.Position.X - 4 * blc / 2000, bf.Position.Y - 4 * blc / 2000, 0);
@@ -96,7 +101,7 @@ namespace HCTools
                                     }
                                 }
                             }
-                        } 
+                        }
 
                         BlockReference blcref = (BlockReference)tr.GetObject(bf.ObjectId, OpenMode.ForWrite);
                         blcref.Layer = "点线矛盾高程点图层";
@@ -205,7 +210,7 @@ namespace HCTools
         }
 
         //检查是否有点线矛盾
-        private bool IfContradition(List<Polyline> pllist,Point3d pt,double length)
+        private bool IfContradition(List<Polyline> pllist, Point3d pt, double length)
         {
             var result = new List<List<IntersectionResult>>();
 
@@ -236,9 +241,9 @@ namespace HCTools
                 temppl.IntersectWith(searchline2, Intersect.OnBothOperands, plane, vertical_pt, IntPtr.Zero, IntPtr.Zero);
 
                 Matrix3d inverseMatrix = Matrix3d.Displacement(-translation);
-                Point3dCollection horizontal_pt_transformed = new Point3dCollection();
-                Point3dCollection vertical_pt_transformed = new Point3dCollection();
-                if (horizontal_pt.Count!=0)
+                var horizontal_pt_transformed = new List<Point3d>();
+                var vertical_pt_transformed = new List<Point3d>();
+                if (horizontal_pt.Count != 0)
                 {
                     foreach (Point3d ptitem in horizontal_pt)
                         horizontal_pt_transformed.Add(ptitem.TransformBy(inverseMatrix));
@@ -260,7 +265,7 @@ namespace HCTools
             //搜索是否有相应高程的等高线
             bool hastarget_horizontal = horizontal.Any(item => Math.Round(item.Contour.Elevation - ele1, db.Luprec) == 0) &&
                                         horizontal.Any(item => Math.Round(item.Contour.Elevation - ele2, db.Luprec) == 0);
-            bool hastarget_vertical = vertical.Any(item => Math.Round(item.Contour.Elevation - ele1, db.Luprec) == 0)&&
+            bool hastarget_vertical = vertical.Any(item => Math.Round(item.Contour.Elevation - ele1, db.Luprec) == 0) &&
                                       vertical.Any(item => Math.Round(item.Contour.Elevation - ele2, db.Luprec) == 0);
 
             //如果有，则判断高程点是否在两线之间,
@@ -315,14 +320,26 @@ namespace HCTools
                 if (horizontal.Count >= 2)
                 {
                     List<Point3d> pts = new List<Point3d>();
+                    //将高程点左右的线分开，分别放到两个list
+                    var side1 = new List<Point3d>();
+                    var side2 = new List<Point3d>();
                     foreach (var item in horizontal)
                     {
-                        foreach (Point3d p in item.IntersectionPoint)
+                        foreach (var p in item.IntersectionPoint)
                         {
-                            pts.Add(p);
+                            if (Math.Sign(pt.X - p.X) > 0 & !side1.Contains(p) && !side2.Contains(p))
+                                side1.Add(p);
+                            else if (Math.Sign(pt.X - p.X) < 0 & !side1.Contains(p) && !side2.Contains(p))
+                                side2.Add(p);
+                            else
+                                continue;
                         }
                     }
-                    var pts_sorted = pts.OrderBy(p => p.DistanceTo(pt));
+                    //如果左右各有一条等高线，由于左右的等高线高程不是需要的高程所以为异常点
+                    if (side1.Count == 1 && side2.Count == 1)
+                        return true;
+                    var largerList = side1.Count >= side2.Count ? side1 : side2;
+                    var pts_sorted = largerList.OrderBy(p => p.DistanceTo(pt));
                     Point3d point = new Point3d();
                     Polyline pl = new Polyline();
                     foreach (var item in pts_sorted)
@@ -331,6 +348,8 @@ namespace HCTools
                         {
                             point = item;
                             pl = horizontal.Find(p => p.IntersectionPoint.Contains(item)).Contour;
+                            if (Math.Abs(pt.Z - pl.Elevation) > dgj)
+                                return true;
                         }
                         else
                         {
@@ -351,14 +370,24 @@ namespace HCTools
                 if (vertical.Count >= 2)
                 {
                     List<Point3d> pts = new List<Point3d>();
+                    var side1 = new List<Point3d>();
+                    var side2 = new List<Point3d>();
                     foreach (var item in vertical)
                     {
-                        foreach (Point3d p in item.IntersectionPoint)
+                        foreach (var p in item.IntersectionPoint)
                         {
-                            pts.Add(p);
+                            if (Math.Sign(pt.Y - p.Y) > 0 & !side1.Contains(p) && !side2.Contains(p))
+                                side1.Add(p);
+                            else if (Math.Sign(pt.Y - p.Y) < 0 & !side1.Contains(p) && !side2.Contains(p))
+                                side2.Add(p);
+                            else
+                                continue;
                         }
                     }
-                    var pts_sorted = pts.OrderBy(p => p.DistanceTo(pt));
+                    if (side1.Count == 1 && side2.Count == 1)
+                        return true;
+                    var largerList = side1.Count >= side2.Count ? side1 : side2;
+                    var pts_sorted = largerList.OrderBy(p => p.DistanceTo(pt));
                     Point3d point = new Point3d();
                     Polyline pl = new Polyline();
                     foreach (var item in pts_sorted)
@@ -367,6 +396,8 @@ namespace HCTools
                         {
                             point = item;
                             pl = vertical.Find(p => p.IntersectionPoint.Contains(item)).Contour;
+                            if (Math.Abs(pt.Z - pl.Elevation) > dgj)
+                                return true;
                         }
                         else
                         {

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

@@ -155,5 +155,17 @@ namespace HCTools.Properties {
                 this["FCY"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("四川中水成勘院测绘工程有限责任公司")]
+        public string Company {
+            get {
+                return ((string)(this["Company"]));
+            }
+            set {
+                this["Company"] = value;
+            }
+        }
     }
 }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/Properties/Settings.settings

@@ -38,5 +38,8 @@ xxxx年xx月测制</Value>
     <Setting Name="FCY" Type="System.String" Scope="User">
       <Value Profile="(Default)">复查员 </Value>
     </Setting>
+    <Setting Name="Company" Type="System.String" Scope="User">
+      <Value Profile="(Default)">四川中水成勘院测绘工程有限责任公司</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

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

@@ -110,7 +110,7 @@ namespace HCTools
             ChPLContradiction1 chplc = new ChPLContradiction1();
             chplc.Check();
             this.Close();
-            MessageBox.Show("点线矛盾检查完成。");
+            MessageBox.Show("点线矛盾检查完成。\n共有"+ ChPLContradiction1.num + "个异常点。");
         }
 
         private void btn_Cancel_Click(object sender, EventArgs e)

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

@@ -49,12 +49,14 @@ namespace HCTools
             this.label2 = new System.Windows.Forms.Label();
             this.textBox_secret = new System.Windows.Forms.TextBox();
             this.textBox_FCY = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.textBox_Company = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // label_blc_TK
             // 
             this.label_blc_TK.AutoSize = true;
-            this.label_blc_TK.Location = new System.Drawing.Point(304, 335);
+            this.label_blc_TK.Location = new System.Drawing.Point(304, 383);
             this.label_blc_TK.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label_blc_TK.Name = "label_blc_TK";
             this.label_blc_TK.Size = new System.Drawing.Size(52, 15);
@@ -68,8 +70,9 @@ namespace HCTools
             this.comboBox_BLC1.Items.AddRange(new object[] {
             "1:500",
             "1:1000",
-            "1:2000"});
-            this.comboBox_BLC1.Location = new System.Drawing.Point(364, 332);
+            "1:2000",
+            "1:5000"});
+            this.comboBox_BLC1.Location = new System.Drawing.Point(364, 380);
             this.comboBox_BLC1.Margin = new System.Windows.Forms.Padding(4);
             this.comboBox_BLC1.Name = "comboBox_BLC1";
             this.comboBox_BLC1.Size = new System.Drawing.Size(166, 23);
@@ -77,7 +80,7 @@ namespace HCTools
             // 
             // textBox_DH
             // 
-            this.textBox_DH.Location = new System.Drawing.Point(131, 330);
+            this.textBox_DH.Location = new System.Drawing.Point(131, 378);
             this.textBox_DH.Margin = new System.Windows.Forms.Padding(4);
             this.textBox_DH.Name = "textBox_DH";
             this.textBox_DH.Size = new System.Drawing.Size(156, 25);
@@ -85,7 +88,7 @@ namespace HCTools
             // 
             // textBox_JCY
             // 
-            this.textBox_JCY.Location = new System.Drawing.Point(309, 220);
+            this.textBox_JCY.Location = new System.Drawing.Point(309, 268);
             this.textBox_JCY.Margin = new System.Windows.Forms.Padding(4);
             this.textBox_JCY.Name = "textBox_JCY";
             this.textBox_JCY.Size = new System.Drawing.Size(223, 25);
@@ -94,7 +97,7 @@ namespace HCTools
             // 
             // textBox_SHY
             // 
-            this.textBox_SHY.Location = new System.Drawing.Point(309, 258);
+            this.textBox_SHY.Location = new System.Drawing.Point(309, 306);
             this.textBox_SHY.Margin = new System.Windows.Forms.Padding(4);
             this.textBox_SHY.Name = "textBox_SHY";
             this.textBox_SHY.Size = new System.Drawing.Size(223, 25);
@@ -103,7 +106,7 @@ namespace HCTools
             // 
             // textBox_TDY
             // 
-            this.textBox_TDY.Location = new System.Drawing.Point(76, 258);
+            this.textBox_TDY.Location = new System.Drawing.Point(76, 306);
             this.textBox_TDY.Margin = new System.Windows.Forms.Padding(4);
             this.textBox_TDY.Name = "textBox_TDY";
             this.textBox_TDY.Size = new System.Drawing.Size(213, 25);
@@ -112,7 +115,7 @@ namespace HCTools
             // 
             // textBox_CTY
             // 
-            this.textBox_CTY.Location = new System.Drawing.Point(76, 220);
+            this.textBox_CTY.Location = new System.Drawing.Point(76, 268);
             this.textBox_CTY.Margin = new System.Windows.Forms.Padding(4);
             this.textBox_CTY.Name = "textBox_CTY";
             this.textBox_CTY.Size = new System.Drawing.Size(213, 25);
@@ -121,7 +124,7 @@ namespace HCTools
             // 
             // richTextBox1
             // 
-            this.richTextBox1.Location = new System.Drawing.Point(102, 68);
+            this.richTextBox1.Location = new System.Drawing.Point(102, 116);
             this.richTextBox1.Margin = new System.Windows.Forms.Padding(4);
             this.richTextBox1.Name = "richTextBox1";
             this.richTextBox1.Size = new System.Drawing.Size(414, 133);
@@ -131,7 +134,7 @@ namespace HCTools
             // label_Rich
             // 
             this.label_Rich.AutoSize = true;
-            this.label_Rich.Location = new System.Drawing.Point(57, 75);
+            this.label_Rich.Location = new System.Drawing.Point(57, 123);
             this.label_Rich.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label_Rich.Name = "label_Rich";
             this.label_Rich.Size = new System.Drawing.Size(37, 15);
@@ -158,7 +161,7 @@ namespace HCTools
             // 
             // btn_Cancel
             // 
-            this.btn_Cancel.Location = new System.Drawing.Point(321, 449);
+            this.btn_Cancel.Location = new System.Drawing.Point(321, 497);
             this.btn_Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.btn_Cancel.Name = "btn_Cancel";
             this.btn_Cancel.Size = new System.Drawing.Size(100, 29);
@@ -169,7 +172,7 @@ namespace HCTools
             // 
             // btn_OK
             // 
-            this.btn_OK.Location = new System.Drawing.Point(170, 448);
+            this.btn_OK.Location = new System.Drawing.Point(170, 496);
             this.btn_OK.Margin = new System.Windows.Forms.Padding(4);
             this.btn_OK.Name = "btn_OK";
             this.btn_OK.Size = new System.Drawing.Size(100, 29);
@@ -181,7 +184,7 @@ namespace HCTools
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(47, 407);
+            this.label1.Location = new System.Drawing.Point(47, 455);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(82, 15);
             this.label1.TabIndex = 110;
@@ -189,14 +192,14 @@ namespace HCTools
             // 
             // textBox_savepath
             // 
-            this.textBox_savepath.Location = new System.Drawing.Point(135, 404);
+            this.textBox_savepath.Location = new System.Drawing.Point(135, 452);
             this.textBox_savepath.Name = "textBox_savepath";
             this.textBox_savepath.Size = new System.Drawing.Size(304, 25);
             this.textBox_savepath.TabIndex = 111;
             // 
             // button_chse
             // 
-            this.button_chse.Location = new System.Drawing.Point(455, 400);
+            this.button_chse.Location = new System.Drawing.Point(455, 448);
             this.button_chse.Name = "button_chse";
             this.button_chse.Size = new System.Drawing.Size(75, 29);
             this.button_chse.TabIndex = 112;
@@ -207,7 +210,7 @@ namespace HCTools
             // label_DH
             // 
             this.label_DH.AutoSize = true;
-            this.label_DH.Location = new System.Drawing.Point(71, 338);
+            this.label_DH.Location = new System.Drawing.Point(71, 386);
             this.label_DH.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label_DH.Name = "label_DH";
             this.label_DH.Size = new System.Drawing.Size(37, 15);
@@ -217,7 +220,7 @@ namespace HCTools
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(49, 371);
+            this.label2.Location = new System.Drawing.Point(49, 419);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(187, 15);
             this.label2.TabIndex = 113;
@@ -225,25 +228,43 @@ namespace HCTools
             // 
             // textBox_secret
             // 
-            this.textBox_secret.Location = new System.Drawing.Point(242, 368);
+            this.textBox_secret.Location = new System.Drawing.Point(242, 416);
             this.textBox_secret.Name = "textBox_secret";
             this.textBox_secret.Size = new System.Drawing.Size(151, 25);
             this.textBox_secret.TabIndex = 114;
             // 
             // textBox_FCY
             // 
-            this.textBox_FCY.Location = new System.Drawing.Point(76, 297);
+            this.textBox_FCY.Location = new System.Drawing.Point(76, 345);
             this.textBox_FCY.Margin = new System.Windows.Forms.Padding(4);
             this.textBox_FCY.Name = "textBox_FCY";
             this.textBox_FCY.Size = new System.Drawing.Size(213, 25);
             this.textBox_FCY.TabIndex = 115;
             this.textBox_FCY.Text = "复查员 ";
             // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(29, 79);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(67, 15);
+            this.label3.TabIndex = 116;
+            this.label3.Text = "公司名：";
+            // 
+            // textBox_Company
+            // 
+            this.textBox_Company.Location = new System.Drawing.Point(102, 76);
+            this.textBox_Company.Name = "textBox_Company";
+            this.textBox_Company.Size = new System.Drawing.Size(414, 25);
+            this.textBox_Company.TabIndex = 117;
+            // 
             // TKInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(610, 510);
+            this.ClientSize = new System.Drawing.Size(610, 556);
+            this.Controls.Add(this.textBox_Company);
+            this.Controls.Add(this.label3);
             this.Controls.Add(this.textBox_FCY);
             this.Controls.Add(this.textBox_secret);
             this.Controls.Add(this.label2);
@@ -294,5 +315,7 @@ namespace HCTools
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TextBox textBox_secret;
         private System.Windows.Forms.TextBox textBox_FCY;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox textBox_Company;
     }
 }

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

@@ -29,6 +29,7 @@ namespace HCTools
         public static string SV = "";
         public static int DH = -1;
         public static string Secret = "";
+        public static string Company = "";
 
         public static int BLC = 2000;
         //public static string ConstLine1 = "GB/T20257.1-2007国家基本比例尺地图图式 第一部分:";
@@ -54,6 +55,7 @@ namespace HCTools
             this.textBox_FCY.Text = Properties.Settings.Default.FCY;
             this.textBox_DH.Text = Properties.Settings.Default.DH.ToString();
             this.textBox_secret.Text = Properties.Settings.Default.secret.ToString();
+            this.textBox_Company.Text = Properties.Settings.Default.Company.ToString();
             textBox_savepath.Text = Properties.Settings.Default.svpath;
         }
 
@@ -84,6 +86,8 @@ namespace HCTools
             FCY = this.textBox_FCY.Text;
             SV = textBox_savepath.Text;
             Secret = textBox_secret.Text;
+            Company = textBox_Company.Text;
+
 
             if (string.IsNullOrEmpty(textBox_DH.Text.Trim()) == false)
             {
@@ -98,10 +102,14 @@ namespace HCTools
             {
                 BLC = 1000;
             }
-            else
+            else if (comboBox_BLC1.SelectedIndex == 2)
             {
                 BLC = 2000;
             }
+            else if (comboBox_BLC1.SelectedIndex == 3)
+            {
+                BLC = 5000;
+            }
 
             //界面最小化
             this.Close();
@@ -118,6 +126,7 @@ namespace HCTools
             Properties.Settings.Default.DH = DH;
             Properties.Settings.Default.svpath = SV;
             Properties.Settings.Default.secret = Secret;
+            Properties.Settings.Default.Company = Company;
             Properties.Settings.Default.Save();
             MessageBox.Show("生成完毕");
         }

加密后软件工具/CAD插件工具/源代码/HCTools/HCTools/bin/Debug/HCTools.dll.config

@@ -54,6 +54,9 @@ xxxx年xx月测制</value>
       <setting name="FCY" serializeAs="String">
         <value>复查员 </value>
       </setting>
+      <setting name="Company" serializeAs="String">
+        <value>四川中水成勘院测绘工程有限责任公司</value>
+      </setting>
     </HCTools.Properties.Settings>
   </userSettings>
 </configuration>