From 5e1bd8ca9ac0d485f02ebf956c541e5e2c6632e9 Mon Sep 17 00:00:00 2001 From: GG Z <903524121@qq.com> Date: Fri, 11 Jun 2021 15:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RookieStation/CmdArrangeShelfCards.cs | 23 +- RookieStation/CmdBrowserFamily.cs | 15 +- RookieStation/CmdNewDimension.cs | 2 +- RookieStation/CmdPlaceEntranceGate.cs | 45 +- RookieStation/CmdPlaceExitGate.cs | 76 +- RookieStation/CmdPlaceFloorFinishes.cs | 838 ++++++++--------- RookieStation/CmdPlaceLamps.cs | 349 ++++--- RookieStation/CmdPlaceReceptionArea.cs | 253 ++--- RookieStation/CmdPlaceShelves.cs | 154 ++-- RookieStation/CmdPlaceWallFinishes.cs | 336 +++++-- RookieStation/Custom/Enum.cs | 4 +- RookieStation/Custom/Shelf.cs | 10 +- RookieStation/RookieStation.csproj | 1 - RookieStation/RsApp.cs | 39 +- .../RsLibrary/Document/样板工程量清单.xlsx | Bin 132519 -> 133370 bytes RookieStation/ShelvesPlacementViewModel.cs | 34 +- RookieStation/TestCmd.cs | 52 -- RookieStation/Utils/DocumentExtension.cs | 4 +- RookieStation/Utils/RsRevitUtils.cs | 160 ++-- RookieStation/Utils/ViewPlanCmdEnabled.cs | 13 + RookieStation/WpfEntranceGate.xaml | 2 +- RookieStation/WpfEntranceGate.xaml.cs | 7 +- RookieStation/WpfExitGate.xaml | 2 +- RookieStation/WpfExitGate.xaml.cs | 12 +- RookieStation/WpfFloorFinishes.xaml | 6 +- RookieStation/WpfFloorFinishes.xaml.cs | 16 +- RookieStation/WpfLampsLayout.xaml.cs | 11 +- RookieStation/WpfReceptionArea.xaml | 187 ++-- RookieStation/WpfReceptionArea.xaml.cs | 48 +- RookieStation/WpfShelfCards.xaml | 10 +- RookieStation/WpfShelfCards.xaml.cs | 293 +++--- RookieStation/WpfShelvesLayout.xaml | 50 +- RookieStation/WpfShelvesLayout.xaml.cs | 30 +- RookieStation/WpfWallFinishes.xaml | 69 +- RookieStation/WpfWallFinishes.xaml.cs | 9 +- RookieStation/cmdExportWorkSchedule.cs | 350 ++++--- RookieStationSetup/RookieStationSetup.vdproj | 868 +++++++++--------- 37 files changed, 2288 insertions(+), 2090 deletions(-) delete mode 100644 RookieStation/TestCmd.cs diff --git a/RookieStation/CmdArrangeShelfCards.cs b/RookieStation/CmdArrangeShelfCards.cs index b966101..615628d 100644 --- a/RookieStation/CmdArrangeShelfCards.cs +++ b/RookieStation/CmdArrangeShelfCards.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Windows; +using System.Windows.Controls; namespace RookieStation.PackAreaModule { @@ -17,22 +18,21 @@ namespace RookieStation.PackAreaModule public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements) { UIApplication uiapp = commandData.Application; - UIDocument uidoc = uiapp.ActiveUIDocument; - string addin_path = typeof(RsApp).Assembly.Location; - string assembly_directory = System.IO.Path.GetDirectoryName(addin_path); - AssemblyLoader loader = new AssemblyLoader(assembly_directory); + string addinPath = typeof(RsApp).Assembly.Location; + string assemblyDirectory = System.IO.Path.GetDirectoryName(addinPath); + AssemblyLoader loader = new AssemblyLoader(assemblyDirectory); try { loader.HookAssemblyResolve(); - WpfShelfCards cards_number = new WpfShelfCards(uiapp); + WpfShelfCards shelfCards = new WpfShelfCards(uiapp); - System.Windows.Interop.WindowInteropHelper mainUI = new System.Windows.Interop.WindowInteropHelper(cards_number) + System.Windows.Interop.WindowInteropHelper mainui = new System.Windows.Interop.WindowInteropHelper(shelfCards) { Owner = System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle }; - cards_number.ShowDialog(); + shelfCards.ShowDialog(); } catch (Exception ex) { @@ -43,7 +43,16 @@ namespace RookieStation.PackAreaModule { loader.UnhookAssemblyResolve(); } + //if (shelfcards.IsPlace) + //{ + // PlaceCards(shelfcards, uidoc); + //} + //else + //{ + // NumberCards(shelfcards, uidoc); + //} return Result.Succeeded; + //if (IsVisible("端牌编号")) //{ // WinIntPtr.ShowAndActive("端牌编号"); diff --git a/RookieStation/CmdBrowserFamily.cs b/RookieStation/CmdBrowserFamily.cs index a41fa1a..f9e7415 100644 --- a/RookieStation/CmdBrowserFamily.cs +++ b/RookieStation/CmdBrowserFamily.cs @@ -15,11 +15,18 @@ namespace RookieStation.CommonTools { public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements) { - UIApplication uiapp = commandData.Application; - UIDocument uidoc = uiapp.ActiveUIDocument; //var dpid = new DockablePaneId(PaneIdentifiers.GetManagerPaneIdentifier()); - var library_directory = UserConstant.FamilyLibraryDirectory; - System.Diagnostics.Process.Start(library_directory); + try + { + var libraryDirectory = UserConstant.FamilyLibraryDirectory; + System.Diagnostics.Process.Start(libraryDirectory); + } + catch (Exception) + { + TaskDialog.Show("温馨提示", "路径不存在，无法浏览文件"); + return Result.Failed; + } + return Result.Succeeded; } } diff --git a/RookieStation/CmdNewDimension.cs b/RookieStation/CmdNewDimension.cs index 129edb9..85f93c2 100644 --- a/RookieStation/CmdNewDimension.cs +++ b/RookieStation/CmdNewDimension.cs @@ -28,7 +28,7 @@ namespace RookieStation List reffaces = new List(); var ins = instances.FirstOrDefault(); - var p = RsRevitUtils.GetXYZByElement(ins); + var p = RsRevitUtils.GetLocationPointByElement(ins); var v = ins.FacingOrientation; Line line = Line.CreateUnbound(p, v); //createoffest需要根据线的方向和参考方向进行叉乘 diff --git a/RookieStation/CmdPlaceEntranceGate.cs b/RookieStation/CmdPlaceEntranceGate.cs index c08590b..91a5c22 100644 --- a/RookieStation/CmdPlaceEntranceGate.cs +++ b/RookieStation/CmdPlaceEntranceGate.cs @@ -38,20 +38,19 @@ namespace RookieStation.PackAreaModule Document doc = uidoc.Document; revitWindow = uiapp.MainWindowHandle; - WpfEntranceGate entrancegateLayout = CommonUtils.GenerateWindow(); + WpfEntranceGate entranceGateLayout = CommonUtils.GenerateWindow(); + if (entranceGateLayout.DialogResult != true) + { + return Result.Cancelled; + } return doc.InvokeGroup(tg => { - if (entrancegateLayout.DialogResult != true) - { - return Result.Cancelled; - } - try { - FamilySymbol linesymbol = RsRevitUtils.GetGuideSymbol(doc); + FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc); eleIdsAdded.Clear(); uiapp.Application.DocumentChanged += Application_DocumentChanged; - uidoc.PromptForFamilyInstancePlacement(linesymbol); + uidoc.PromptForFamilyInstancePlacement(guideSymbol); uiapp.Application.DocumentChanged -= Application_DocumentChanged; } catch (Autodesk.Revit.Exceptions.OperationCanceledException) @@ -60,13 +59,13 @@ namespace RookieStation.PackAreaModule { return Result.Cancelled; } - Line refer_line = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); + Line line = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); uiapp.Application.DocumentChanged -= Application_DocumentChanged; - double interval = (330 + entrancegateLayout.passage_width) / 304.8; + double interval = (330 + entranceGateLayout.PassageWidth) / 304.8; double offest = 0.0; //布置闸机的数量 - List pts = GetInstancePointsByLine(refer_line, interval); + List pts = GetInstancePointsByLine(line, interval); List instances = new List(); doc.Invoke(ts => { @@ -74,43 +73,43 @@ namespace RookieStation.PackAreaModule }, "创建闸机位置"); doc.Invoke(ts => { - RsRevitUtils.AdjustInstances(doc, instances, refer_line, offest); + RsRevitUtils.AdjustInstances(doc, instances, line, offest); }, "调整闸机位置"); } return Result.Succeeded; }, "布置入口闸机"); } - private void CreateGates(UIDocument uidoc, List pts, out List fis, out double offest) + private void CreateGates(UIDocument uidoc, List points, out List fis, out double offest) { Document doc = uidoc.Document; fis = new List(); Level level = uidoc.ActiveView.GenLevel; - Family gate_family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\闸机.rfa"); - ElementId symbol_id = gate_family.GetFamilySymbolIds().FirstOrDefault(); - FamilySymbol gate_symbol = doc.GetElement(symbol_id) as FamilySymbol; - offest = gate_symbol.GetParameters("深度").FirstOrDefault().AsDouble() / 2; - gate_symbol.Activate(); - foreach (var pt in pts) + Family gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\闸机.rfa"); + ElementId symbolId = gateFamily.GetFamilySymbolIds().FirstOrDefault(); + FamilySymbol gateSymbol = doc.GetElement(symbolId) as FamilySymbol; + offest = gateSymbol.GetParameters("深度").FirstOrDefault().AsDouble() / 2; + gateSymbol.Activate(); + foreach (XYZ p in points) { - var instance = doc.Create.NewFamilyInstance(pt, gate_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + var instance = doc.Create.NewFamilyInstance(p, gateSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); fis.Add(instance); } } - private List GetInstancePointsByLine(Line referline, double interval) + private List GetInstancePointsByLine(Line line, double interval) { int n = 50; List pts = new List(); for (int i = 0; i < n; i++) { double parameter = (i + 0.5) * interval; - if (!referline.IsInside(parameter + (interval / 2))) + if (!line.IsInside(parameter + (interval / 2))) { break; } - pts.Add(referline.Evaluate(parameter, false)); + pts.Add(line.Evaluate(parameter, false)); } return pts; diff --git a/RookieStation/CmdPlaceExitGate.cs b/RookieStation/CmdPlaceExitGate.cs index dcce812..1620f6a 100644 --- a/RookieStation/CmdPlaceExitGate.cs +++ b/RookieStation/CmdPlaceExitGate.cs @@ -44,18 +44,18 @@ namespace RookieStation.PackAreaModule Document doc = uidoc.Document; revitWindow = uiapp.MainWindowHandle; - WpfExitGate gate_layout = CommonUtils.GenerateWindow(); + WpfExitGate gateLayout = CommonUtils.GenerateWindow(); - if (gate_layout.DialogResult == true) + if (gateLayout.DialogResult == true) { - isPassageStart = gate_layout.isStartPassage; + isPassageStart = gateLayout.IsStartPassage; } else { return Result.Cancelled; } - double interval = (2 * (1030 + gate_layout.passage_width) + 100) / 304.8; - double gate_front_offest = 1630 / 304.8; + double interval = (2 * (1030 + gateLayout.PassageWidth) + 100) / 304.8; + double gateFrontOffest = 1630 / 304.8; List instances = new List(); using (TransactionGroup tg = new TransactionGroup(doc, "布置出口收检台")) @@ -63,11 +63,11 @@ namespace RookieStation.PackAreaModule tg.Start(); try { - FamilySymbol line_symbol = RsRevitUtils.GetGuideSymbol(doc); ; + FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc); ; eleIdsAdded.Clear(); uiapp.Application.DocumentChanged += Application_DocumentChanged; - uidoc.PromptForFamilyInstancePlacement(line_symbol); + uidoc.PromptForFamilyInstancePlacement(guideSymbol); uiapp.Application.DocumentChanged -= Application_DocumentChanged; } catch (Autodesk.Revit.Exceptions.OperationCanceledException) @@ -77,7 +77,7 @@ namespace RookieStation.PackAreaModule return Result.Cancelled; } //直线向量 - Line refer_line = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); + Line referline = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); uiapp.Application.DocumentChanged -= Application_DocumentChanged; int orders = UserConstant.Orders; @@ -89,46 +89,46 @@ namespace RookieStation.PackAreaModule } int m = isPassageStart - ? (int)Math.Floor((refer_line.Length * 304.8 / 1630) + 0.5) - : (int)Math.Floor(((refer_line.Length * 304.8) - 200) / 1630 + 0.5); + ? (int)Math.Floor((referline.Length * 304.8 / 1630) + 0.5) + : (int)Math.Floor(((referline.Length * 304.8) - 200) / 1630 + 0.5); if (m < n) { n = m; } - List pts = new List(); + List locationPoint = new List(); doc.Invoke(ts => { - Family gate_family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\L型收检台.rfa"); - IEnumerable left_symbolId = from id in gate_family.GetFamilySymbolIds() - where doc.GetElement(id).Name == "左" + Family gateFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Gate\\L型收检台.rfa"); + IEnumerable leftSymbolId = from id in gateFamily.GetFamilySymbolIds() + where doc.GetElement(id).Name == "左" + select id; + IEnumerable rightSymbolId = from id in gateFamily.GetFamilySymbolIds() + where doc.GetElement(id).Name == "右" select id; - IEnumerable right_symbolId = from id in gate_family.GetFamilySymbolIds() - where doc.GetElement(id).Name == "右" - select id; - FamilySymbol right_symbol = doc.GetElement(right_symbolId.FirstOrDefault()) as FamilySymbol; + FamilySymbol rightSymbol = doc.GetElement(rightSymbolId.FirstOrDefault()) as FamilySymbol; //ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); - FamilySymbol left_symbol = doc.GetElement(left_symbolId.FirstOrDefault()) as FamilySymbol; + FamilySymbol leftSymbol = doc.GetElement(leftSymbolId.FirstOrDefault()) as FamilySymbol; Level level = uidoc.ActiveView.GenLevel; if (isPassageStart)//起始是通道 { for (int i = 0; i < n; i++) { - XYZ p = refer_line.Evaluate(i * interval, false); - pts.Add(p); + XYZ p = referline.Evaluate(i * interval, false); + locationPoint.Add(p); } - foreach (XYZ location_XYZ in pts) + foreach (XYZ point in locationPoint) { - left_symbol.Activate(); - FamilyInstance left_instance = doc.Create.NewFamilyInstance(location_XYZ, left_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(left_instance); + leftSymbol.Activate(); + FamilyInstance leftInstance = doc.Create.NewFamilyInstance(point, leftSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(leftInstance); if (instances.Count() == n + 1) { break; } - right_symbol.Activate(); - FamilyInstance right_instance = doc.Create.NewFamilyInstance(location_XYZ, right_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(right_instance); + rightSymbol.Activate(); + FamilyInstance rightInstance = doc.Create.NewFamilyInstance(point, rightSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(rightInstance); if (instances.Count() == n + 1) { break; @@ -144,25 +144,25 @@ namespace RookieStation.PackAreaModule { for (int i = 0; i < n; i++) { - XYZ p = refer_line.Evaluate((i * interval) + 1830 / 304.8, false); + XYZ p = referline.Evaluate((i * interval) + 1830 / 304.8, false); - pts.Add(p); + locationPoint.Add(p); } - foreach (var pt in pts) + foreach (var pt in locationPoint) { - left_symbol.Activate(); - var left_instance = doc.Create.NewFamilyInstance(pt, left_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + leftSymbol.Activate(); + var leftInstance = doc.Create.NewFamilyInstance(pt, leftSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); //offest = symbol.GetParameters("深度").FirstOrDefault().AsDouble() / 2; - instances.Add(left_instance); + instances.Add(leftInstance); if (instances.Count() == n) { break; } - right_symbol.Activate(); - var right_instance = doc.Create.NewFamilyInstance(pt, right_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(right_instance); + rightSymbol.Activate(); + var rightInstance = doc.Create.NewFamilyInstance(pt, rightSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(rightInstance); if (instances.Count() == n) { break; @@ -172,7 +172,7 @@ namespace RookieStation.PackAreaModule }, "加载并创建收检台"); doc.Invoke(ts => { - RsRevitUtils.AdjustInstances(doc, instances, refer_line, gate_front_offest); + RsRevitUtils.AdjustInstances(doc, instances, referline, gateFrontOffest); }, "调整收检台位置"); //if (tg.GetStatus() == TransactionStatus.Started) //{ diff --git a/RookieStation/CmdPlaceFloorFinishes.cs b/RookieStation/CmdPlaceFloorFinishes.cs index cb5690d..e4cfd4b 100644 --- a/RookieStation/CmdPlaceFloorFinishes.cs +++ b/RookieStation/CmdPlaceFloorFinishes.cs @@ -39,485 +39,457 @@ namespace RookieStation.Finishes if (floorCovering.DialogResult == true) { - length = floorCovering.cLength / 304.8; - width = floorCovering.cWidth / 304.8; - gap = floorCovering.cGap / 304.8; + length = floorCovering.PavementLength / 304.8; + width = floorCovering.PavementWidth / 304.8; + gap = floorCovering.PavementGap / 304.8; } else { return Result.Cancelled; } - using (TransactionGroup tg = new TransactionGroup(doc, "地面铺装")) - { - try - { - var v = new FilteredElementCollector(doc).OfClass(typeof(View)) - .Cast() - .FirstOrDefault(x => x.ViewType == ViewType.FloorPlan && x.GenLevel.Elevation == 0); + return doc.InvokeGroup(tg => + { + try + { + //var v = new FilteredElementCollector(doc).OfClass(typeof(View)) + // .Cast() + // .FirstOrDefault(x => x.ViewType == ViewType.FloorPlan && x.GenLevel.Elevation == 0); - var baselevel = new FilteredElementCollector(doc) - .OfClass(typeof(Level)) - .Cast() - .FirstOrDefault(x => x.Elevation == 0); + //if (uidoc.ActiveView.ViewType != ViewType.FloorPlan) + //{ + // uidoc.RequestViewChange(v); + //} + var baseLevel = doc.ActiveView.GenLevel; + List modelCurveIds = new List(); - List modelCurveIds = new List(); - tg.Start(); - if (uidoc.ActiveView.ViewType != ViewType.FloorPlan) - { - uidoc.RequestViewChange(v); - } + SelectFilter roomFilter = new SelectFilter(); + Reference roomReference = uidoc.Selection.PickObject(ObjectType.Element, roomFilter, "请选择房间"); + Room room = doc.GetElement(roomReference) as Room; - SelectFilter selfilter = new SelectFilter(); - Reference roomrefer = uidoc.Selection.PickObject(ObjectType.Element, selfilter, "请选择房间"); - Room room = doc.GetElement(roomrefer) as Room; + var roompoint = RsRevitUtils.GetLocationPointByElement(room); + var segments = room.GetBoundarySegments(new SpatialElementBoundaryOptions()).FirstOrDefault(); - var roompoint = RsRevitUtils.GetXYZByElement(room); - var segments = room.GetBoundarySegments(new SpatialElementBoundaryOptions()).FirstOrDefault(); + doc.Invoke(ts => + { + foreach (var seg in segments) + { + Curve cur = seg.GetCurve(); + Plane plane = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); + var mc = doc.Create.NewModelCurve(cur, SketchPlane.Create(doc, plane)); + modelCurveIds.Add(mc.Id); + } + }, "模型线创建"); - doc.Invoke(ts => - { - foreach (var seg in segments) - { - Curve cur = seg.GetCurve(); - Plane plane = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); - var mc = doc.Create.NewModelCurve(cur, SketchPlane.Create(doc, plane)); - modelCurveIds.Add(mc.Id); - } - }, "模型线创建"); + //Reference edge = uidoc.Selection.PickObject(ObjectType.Edge, "请选择边界"); + SelectFilter mlFilter = new SelectFilter(); + Reference refline = uidoc.Selection.PickObject(ObjectType.Element, mlFilter, "请选择基准边线"); + //模型线选取 + var ml = doc.GetElement(refline) as ModelLine; + Line referline = ml.GeometryCurve as Line; + Line longestLine = RsRevitUtils.GetLongestSegmentLine(segments, referline); + XYZ basePoint = uidoc.Selection.PickPoint(UserConstant.SnapAll, "请选择基准点（位于基准线上）"); + double lengthCount = basePoint.DistanceTo(referline.GetEndPoint(0)) + basePoint.DistanceTo(referline.GetEndPoint(1)); + if (referline.Length - lengthCount > 0.001) + { + MessageBox.Show("请选择基准线上的点", "温馨提示"); + return Result.Cancelled; + } + //if (basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(0)) || basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(1))) + //{ + //} + //基准线端点 + var endpoint1 = referline.GetEndPoint(0); + var endpoint2 = referline.GetEndPoint(1); + //基准点向端点的向量 + XYZ v1 = endpoint1 - basePoint; + XYZ v2 = endpoint2 - basePoint; + //用于确认布置方向 + var v0 = roompoint - basePoint; + List curves = new List(); + List instances = new List(); + //Curve currefer = null; + //Curve currefer1 = null; - //Reference edge = uidoc.Selection.PickObject(ObjectType.Edge, "请选择边界"); - SelectFilter mlfilter = new SelectFilter(); - Reference refline = uidoc.Selection.PickObject(ObjectType.Element, mlfilter, "请选择基准边线"); - //模型线选取 - var ml = doc.GetElement(refline) as ModelLine; - Line line = ml.GeometryCurve as Line; - Line line1 = RsRevitUtils.GetLongestSegmentLine(segments, line); - XYZ basepoint = uidoc.Selection.PickPoint(UserConstant.SnapAll, "请选择基准点（位于基准线上）"); - double alength = basepoint.DistanceTo(line.GetEndPoint(0)) + basepoint.DistanceTo(line.GetEndPoint(1)); - if (line.Length - alength > 0.001) - { - MessageBox.Show("请选择基准线上的点", "温馨提示"); - return Result.Cancelled; - } - //if (basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(0)) || basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(1))) - //{ - //} - //基准线端点 - var endp1 = line.GetEndPoint(0); - var endp2 = line.GetEndPoint(1); - //基准点向端点的向量 - XYZ v1 = endp1 - basepoint; - XYZ v2 = endp2 - basepoint; - //用于确认布置方向 - var v0 = roompoint - basepoint; - List curves = new List(); - List instances = new List(); - //Curve currefer = null; - //Curve currefer1 = null; + double interval = length + gap; + List pts = new List(); + List lastpoints = new List(); + XYZ zdir1 = null; + XYZ zdir2 = null; + XYZ offestVector = null; + double d1 = 0.0; + double d2 = 0.0; + //切分基准线后，两侧向量不为0 + if (!v1.IsAlmostEqualTo(XYZ.Zero)) + { + if (endpoint1.DistanceTo(basePoint) < length) + { + System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); + return Result.Cancelled; + } + zdir1 = v1.CrossProduct(v0).Normalize(); + //偏移的方向，直线的侧方向 + offestVector = zdir1.CrossProduct(v1).Normalize(); + Line l1 = Line.CreateBound(basePoint, ml.GeometryCurve.GetEndPoint(0)); - double interval = length + gap; - List pts = new List(); - List lastps = new List(); - XYZ zdir1 = null; - XYZ zdir2 = null; - XYZ offestvector = null; - double d1 = 0.0; - double d2 = 0.0; - //切分基准线后，两侧向量不为0 - if (!v1.IsAlmostEqualTo(XYZ.Zero)) - { - if (endp1.DistanceTo(basepoint) < length) - { - System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); - return Result.Cancelled; - } - zdir1 = v1.CrossProduct(v0).Normalize(); - //偏移的方向，直线的侧方向 - offestvector = zdir1.CrossProduct(v1).Normalize(); - Line l1 = Line.CreateBound(basepoint, ml.GeometryCurve.GetEndPoint(0)); + for (int i = 0; i < 10000; i++) + { + var parameter = i * interval; + if (!l1.IsInside(parameter + interval - gap / 2)) + { + var lastp1 = pts.Last() - offestVector * width / 2; - for (int i = 0; i < 10000; i++) - { - var parameter = i * interval; - if (!l1.IsInside(parameter + interval - gap / 2)) - { - var lastp1 = pts.Last() - offestvector * width / 2; + d1 = lastp1.DistanceTo(endpoint1) - length / 2 - gap; - d1 = lastp1.DistanceTo(endp1) - length / 2 - gap; + var lastfinalpoint = lastp1 + (l1.Direction * (d1 / 2 + length / 2 + gap)) + (offestVector * width / 2); - var lastfinalpoint = lastp1 + (l1.Direction * (d1 / 2 + length / 2 + gap)) + (offestvector * width / 2); + lastpoints.Add(lastfinalpoint); + break; + } + XYZ p = l1.Evaluate(parameter, false); + XYZ finalPoint = p + (l1.Direction * interval / 2) + (offestVector * width / 2); + //当选择的基准点为端点时 + if (v2.IsAlmostEqualTo(XYZ.Zero)) + { + finalPoint = p + (l1.Direction * (interval - gap) / 2) + (offestVector * width / 2); + } - lastps.Add(lastfinalpoint); - break; - } - XYZ p = l1.Evaluate(parameter, false); - XYZ finalpoint = p + (l1.Direction * interval / 2) + (offestvector * width / 2); - //当选择的基准点为端点时 - if (v2.IsAlmostEqualTo(XYZ.Zero)) - { - finalpoint = p + (l1.Direction * (interval - gap) / 2) + (offestvector * width / 2); - } + pts.Add(finalPoint); + } + } - pts.Add(finalpoint); - } - } + if (!v2.IsAlmostEqualTo(XYZ.Zero)) + { + if (endpoint2.DistanceTo(basePoint) < length) + { + System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); + return Result.Cancelled; + } + zdir2 = v2.CrossProduct(v0).Normalize(); + offestVector = zdir2.CrossProduct(v2).Normalize(); + Line l2 = Line.CreateBound(basePoint, ml.GeometryCurve.GetEndPoint(1)); - if (!v2.IsAlmostEqualTo(XYZ.Zero)) - { - if (endp2.DistanceTo(basepoint) < length) - { - System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); - return Result.Cancelled; - } - zdir2 = v2.CrossProduct(v0).Normalize(); - offestvector = zdir2.CrossProduct(v2).Normalize(); - Line l2 = Line.CreateBound(basepoint, ml.GeometryCurve.GetEndPoint(1)); + for (int i = 0; i < 10000; i++) + { + var parameter = i * interval; + if (!l2.IsInside(parameter + interval - gap / 2)) + { + //var lastdistance = pts.Last().DistanceTo(endp1) - interval / 2 - gap / 2; - for (int i = 0; i < 10000; i++) - { - var parameter = i * interval; - if (!l2.IsInside(parameter + interval - gap / 2)) - { - //var lastdistance = pts.Last().DistanceTo(endp1) - interval / 2 - gap / 2; + var lastp2 = pts.Last() - offestVector * width / 2; - var lastp2 = pts.Last() - offestvector * width / 2; + d2 = lastp2.DistanceTo(endpoint2) - length / 2 - gap; - d2 = lastp2.DistanceTo(endp2) - length / 2 - gap; + var lastFinalPoint = lastp2 + (l2.Direction * (d2 / 2 + length / 2 + gap)) + (offestVector * width / 2); - var lastfinalpoint = lastp2 + (l2.Direction * (d2 / 2 + length / 2 + gap)) + (offestvector * width / 2); + lastpoints.Add(lastFinalPoint); + break; + } + XYZ p = l2.Evaluate(parameter, false); + //附加的基准线的水平垂直偏移距离 + var finalpoint = p + (l2.Direction * interval / 2) + (offestVector * width / 2); + if (v1.IsAlmostEqualTo(XYZ.Zero)) + { + finalpoint = p + (l2.Direction * (interval - gap) / 2) + (offestVector * width / 2); + } - lastps.Add(lastfinalpoint); - break; - } - XYZ p = l2.Evaluate(parameter, false); - //附加的基准线的水平垂直偏移距离 - var finalpoint = p + (l2.Direction * interval / 2) + (offestvector * width / 2); - if (v1.IsAlmostEqualTo(XYZ.Zero)) - { - finalpoint = p + (l2.Direction * (interval - gap) / 2) + (offestvector * width / 2); - } + pts.Add(finalpoint); + } + //var lastl2 = pts.Last().DistanceTo(endp2); + } + doc.Invoke(ts => + { + //删除模型线 + doc.Delete(modelCurveIds); + family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "FloorFinish\\地砖.rfa"); + ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); + symbol = doc.GetElement(symbolId) as FamilySymbol; + symbol.Activate(); + foreach (var p in pts) + { + var fi = doc.Create + .NewFamilyInstance(p, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(fi); + } + foreach (var p in lastpoints) + { + var fi = doc.Create + .NewFamilyInstance(p, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(fi); + } + }, "地面铺装"); - pts.Add(finalpoint); - } - //var lastl2 = pts.Last().DistanceTo(endp2); - } + doc.Invoke(ts => + { + XYZ veroffestdir = null; + if (zdir1 != null) + { + veroffestdir = zdir1.CrossProduct(referline.Direction).Normalize(); + } + if (zdir2 != null) + { + veroffestdir = zdir2.CrossProduct(referline.Direction).Normalize(); + } + //旋转角度 + double angle = XYZ.BasisY.AngleTo(veroffestdir); + //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针） + var z = veroffestdir.CrossProduct(XYZ.BasisY).Normalize(); + if (z.IsAlmostEqualTo(XYZ.BasisZ)) + { + //逆向旋转，角度取负值 + angle = -angle; + } + //单行调整地砖数量 + int n = 0; + if (v2.IsAlmostEqualTo(XYZ.Zero) || v1.IsAlmostEqualTo(XYZ.Zero)) + { + n = 1; + } + else + { + n = 2; + } + for (int i = 0; i < instances.Count; i++) + { + FamilyInstance fi = instances[i]; - using (Transaction trans = new Transaction(doc, "地面铺装")) - { - trans.Start(); - //删除模型线 - doc.Delete(modelCurveIds); - family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "FloorFinish\\地砖.rfa"); - ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); - symbol = doc.GetElement(symbolId) as FamilySymbol; - symbol.Activate(); - foreach (var p in pts) - { - var fi = doc.Create - .NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(fi); - } - foreach (var p in lastps) - { - var fi = doc.Create - .NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(fi); - } - trans.Commit(); - } - using (Transaction trans = new Transaction(doc, "调整地砖")) - { - trans.Start(); - XYZ veroffestdir = null; - if (zdir1 != null) - { - veroffestdir = zdir1.CrossProduct(line.Direction).Normalize(); - } - if (zdir2 != null) - { - veroffestdir = zdir2.CrossProduct(line.Direction).Normalize(); - } - //旋转角度 - double angle = XYZ.BasisY.AngleTo(veroffestdir); - //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针） - var z = veroffestdir.CrossProduct(XYZ.BasisY).Normalize(); - if (z.IsAlmostEqualTo(XYZ.BasisZ)) - { - //逆向旋转，角度取负值 - angle = -angle; - } - //单行调整地砖数量 - int n = 0; - if (v2.IsAlmostEqualTo(XYZ.Zero) || v1.IsAlmostEqualTo(XYZ.Zero)) - { - n = 1; - } - else - { - n = 2; - } - for (int i = 0; i < instances.Count; i++) - { - FamilyInstance fi = instances[i]; + var filp = RsRevitUtils.GetLocationPointByElement(fi); + Line zaxis = Line.CreateUnbound(filp, XYZ.BasisZ); - var filp = RsRevitUtils.GetXYZByElement(fi); - Line zaxis = Line.CreateUnbound(filp, XYZ.BasisZ); + //旋转，移动 + ElementTransformUtils.RotateElement(doc, fi.Id, zaxis, angle); + fi.GetParameters("长").FirstOrDefault().Set(length); + fi.GetParameters("宽").FirstOrDefault().Set(width); - //旋转，移动 - ElementTransformUtils.RotateElement(doc, fi.Id, zaxis, angle); - fi.GetParameters("长").FirstOrDefault().Set(length); - fi.GetParameters("宽").FirstOrDefault().Set(width); + if (i >= instances.Count - n) + { + var loc = RsRevitUtils.GetLocationPointByElement(instances[i]); - if (i >= instances.Count - n) - { - var loc = RsRevitUtils.GetXYZByElement(instances[i]); + var dis1 = loc.DistanceTo(endpoint1); + var dis2 = loc.DistanceTo(endpoint2); - var dis1 = loc.DistanceTo(endp1); - var dis2 = loc.DistanceTo(endp2); + if (dis1 < interval) + { + fi.GetParameters("长").FirstOrDefault().Set(d1); + } + else if (dis2 < interval) + { + fi.GetParameters("长").FirstOrDefault().Set(d2); + } + } + //ElementTransformUtils.CopyElement(doc, fi.Id, offestvector * (width + gap)); + ////垂直基准线平移 + //ElementTransformUtils.MoveElement(doc, fi.Id, offestdir); - if (dis1 < interval) - { - fi.GetParameters("长").FirstOrDefault().Set(d1); - } - else if (dis2 < interval) - { - fi.GetParameters("长").FirstOrDefault().Set(d2); - } - } - //ElementTransformUtils.CopyElement(doc, fi.Id, offestvector * (width + gap)); - ////垂直基准线平移 - //ElementTransformUtils.MoveElement(doc, fi.Id, offestdir); + ////平行基准线平移 + //ElementTransformUtils.MoveElement(doc, fi.Id, line.Direction * w / 2); + //if (i >= 1) + //{ + // XYZ additionaldir = zdir.CrossProduct(line.Direction).Normalize() * i * (passagewidth + l); + // ElementTransformUtils.MoveElement(doc, fi.Id, additionaldir); + //} + //位于直线右侧时，需要进行左右翻转 + //if (OnLeft == false && fi.CanFlipHand) + //{ + // fi.flipHand(); + //} + } + }, "调整地砖"); - ////平行基准线平移 - //ElementTransformUtils.MoveElement(doc, fi.Id, line.Direction * w / 2); - //if (i >= 1) - //{ - // XYZ additionaldir = zdir.CrossProduct(line.Direction).Normalize() * i * (passagewidth + l); - // ElementTransformUtils.MoveElement(doc, fi.Id, additionaldir); - //} - //位于直线右侧时，需要进行左右翻转 - //if (OnLeft == false && fi.CanFlipHand) - //{ - // fi.flipHand(); - //} - } + doc.Invoke(ts => + { + List idsCopied = new List(); + for (int i = 0; i < instances.Count; i++) + { + FamilyInstance fi = instances[i]; + int num = (int)Math.Floor(longestLine.Length / (width + gap)); + double rem = longestLine.Length - num * (width + gap); + for (int j = 1; j <= num; j++) + { + ICollection eles; + if (j == num) + { + eles = ElementTransformUtils.CopyElement(doc, fi.Id, offestVector * ((rem / 2) + (width + gap) * (j - 0.5) + gap)); + FamilyInstance copyinstance = doc.GetElement(eles.FirstOrDefault()) as FamilyInstance; + copyinstance.GetParameters("宽").FirstOrDefault().Set(rem); - trans.Commit(); - } - using (Transaction trans = new Transaction(doc, "复制地砖")) - { - List copyids = new List(); - trans.Start(); - for (int i = 0; i < instances.Count; i++) - { - FamilyInstance fi = instances[i]; - int num = (int)Math.Floor(line1.Length / (width + gap)); - double rem = line1.Length - num * (width + gap); - for (int j = 1; j <= num; j++) - { - ICollection eles; - if (j == num) - { - eles = ElementTransformUtils.CopyElement(doc, fi.Id, offestvector * ((rem / 2) + (width + gap) * (j - 0.5) + gap)); - FamilyInstance copyinstance = doc.GetElement(eles.FirstOrDefault()) as FamilyInstance; - copyinstance.GetParameters("宽").FirstOrDefault().Set(rem); + idsCopied.AddRange(eles.ToList()); + break; + } + eles = ElementTransformUtils.CopyElement(doc, fi.Id, offestVector * (width + gap) * j); + idsCopied.AddRange(eles.ToList()); + } + } + foreach (var id in idsCopied) + { + FamilyInstance instanceCopied = doc.GetElement(id) as FamilyInstance; + if (instanceCopied.Room == null) + { + doc.Delete(id); + } + } + }, "复制地砖"); - copyids.AddRange(eles.ToList()); - break; - } - eles = ElementTransformUtils.CopyElement(doc, fi.Id, offestvector * (width + gap) * j); - copyids.AddRange(eles.ToList()); - } - } - foreach (var id in copyids) - { - FamilyInstance copyinstance = doc.GetElement(id) as FamilyInstance; - if (copyinstance.Room == null) - { - doc.Delete(id); - } - } - trans.Commit(); - } + #region MyRegion - #region MyRegion + //foreach (var seg in segments) + //{ + // Curve cur = seg.GetCurve(); + // if (cur.GetEndPoint(0).IsAlmostEqualTo(startP) || cur.GetEndPoint(1).IsAlmostEqualTo(startP)) + // { + // currefer = cur; + // } + // if (cur.GetEndPoint(1).IsAlmostEqualTo(startP)) + // { + // currefer1 = cur; + // } - //foreach (var seg in segments) - //{ - // Curve cur = seg.GetCurve(); - // if (cur.GetEndPoint(0).IsAlmostEqualTo(startP) || cur.GetEndPoint(1).IsAlmostEqualTo(startP)) - // { - // currefer = cur; - // } - // if (cur.GetEndPoint(1).IsAlmostEqualTo(startP)) - // { - // currefer1 = cur; - // } + // //XYZ p1 = cur.Evaluate(100 / 304.8, false); + // //XYZ p2 = cur.Evaluate(200 / 304.8, false); + //} - // //XYZ p1 = cur.Evaluate(100 / 304.8, false); - // //XYZ p2 = cur.Evaluate(200 / 304.8, false); - //} + //var n = Math.Floor(currefer1.Length / interval) + 1; + //var rem = currefer1.Length % interval / interval; - //var n = Math.Floor(currefer1.Length / interval) + 1; - //var rem = currefer1.Length % interval / interval; + //var x = 0.5; + //if (rem < 0.334) + //{ + // x = (1 + rem) / 4; + // for (int i = 0; i < n; i++) + // { + // Curve l = null; + // if (i == 0) + // { + // l = currefer.CreateOffset((i + x) * interval, -XYZ.BasisZ); + // } + // if (i >= 1) + // { + // l = currefer.CreateOffset((i - 0.5 + 2 * x) * interval, -XYZ.BasisZ); + // } + // if (i == n - 1) + // { + // l = currefer.CreateOffset((i - 1 + 3 * x) * interval, -XYZ.BasisZ); + // } - //var x = 0.5; - //if (rem < 0.334) - //{ - // x = (1 + rem) / 4; - // for (int i = 0; i < n; i++) - // { - // Curve l = null; - // if (i == 0) - // { - // l = currefer.CreateOffset((i + x) * interval, -XYZ.BasisZ); - // } - // if (i >= 1) - // { - // l = currefer.CreateOffset((i - 0.5 + 2 * x) * interval, -XYZ.BasisZ); - // } - // if (i == n - 1) - // { - // l = currefer.CreateOffset((i - 1 + 3 * x) * interval, -XYZ.BasisZ); - // } + // curves.Add(l); + // } + //} + //else + //{ + // for (int i = 0; i < n; i++) + // { + // //var v = cur.Direction.CrossProduct(XYZ.BasisZ); + // //createoffset的偏移方向由线方向 叉乘 自己给定的方向 - // curves.Add(l); - // } - //} - //else - //{ - // for (int i = 0; i < n; i++) - // { - // //var v = cur.Direction.CrossProduct(XYZ.BasisZ); - // //createoffset的偏移方向由线方向 叉乘 自己给定的方向 + // var l = currefer.CreateOffset((i + x) * interval, -XYZ.BasisZ); + // if (i == n - 1) + // { + // l = currefer.CreateOffset((i - 1 + x) * interval, -XYZ.BasisZ); + // } + // curves.Add(l); + // } + //} - // var l = currefer.CreateOffset((i + x) * interval, -XYZ.BasisZ); - // if (i == n - 1) - // { - // l = currefer.CreateOffset((i - 1 + x) * interval, -XYZ.BasisZ); - // } - // curves.Add(l); - // } - //} + //var m = Math.Floor(currefer.Length / interval) + 1; + //var rem1 = currefer.Length % interval / interval; + //x = 0.5; + //if (rem1 < 0.334) + //{ + // x = (1 + rem1) / 4; + // for (int i = 0; i < m; i++) + // { + // Curve l = null; + // if (i == 0) + // { + // l = currefer1.CreateOffset((i + x) * interval, -XYZ.BasisZ); + // } + // if (i >= 1) + // { + // l = currefer1.CreateOffset((i - 0.5 + 2 * x) * interval, -XYZ.BasisZ); + // } + // if (i == m - 1) + // { + // l = currefer1.CreateOffset((i - 1 + 3 * x) * interval, -XYZ.BasisZ); + // } - //var m = Math.Floor(currefer.Length / interval) + 1; - //var rem1 = currefer.Length % interval / interval; - //x = 0.5; - //if (rem1 < 0.334) - //{ - // x = (1 + rem1) / 4; - // for (int i = 0; i < m; i++) - // { - // Curve l = null; - // if (i == 0) - // { - // l = currefer1.CreateOffset((i + x) * interval, -XYZ.BasisZ); - // } - // if (i >= 1) - // { - // l = currefer1.CreateOffset((i - 0.5 + 2 * x) * interval, -XYZ.BasisZ); - // } - // if (i == m - 1) - // { - // l = currefer1.CreateOffset((i - 1 + 3 * x) * interval, -XYZ.BasisZ); - // } + // curves.Add(l); + // } + //} + //else + //{ + // for (int i = 0; i < m; i++) + // { + // var l = currefer1.CreateOffset((i + x) * interval, -XYZ.BasisZ); + // if (i == m - 1) + // { + // l = currefer.CreateOffset((i - 1 + x) * interval, -XYZ.BasisZ); + // } + // curves.Add(l); + // } + //} - // curves.Add(l); - // } - //} - //else - //{ - // for (int i = 0; i < m; i++) - // { - // var l = currefer1.CreateOffset((i + x) * interval, -XYZ.BasisZ); - // if (i == m - 1) - // { - // l = currefer.CreateOffset((i - 1 + x) * interval, -XYZ.BasisZ); - // } - // curves.Add(l); - // } - //} + //var pts = GetIntersectPoints(curves); + //Plane pl = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); + //foreach (var item in curves) + //{ + // ModelCurve model = doc.Create.NewModelCurve(item, SketchPlane.Create(doc, pl)); + //} - //var pts = GetIntersectPoints(curves); - //Plane pl = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); - //foreach (var item in curves) - //{ - // ModelCurve model = doc.Create.NewModelCurve(item, SketchPlane.Create(doc, pl)); - //} + //foreach (var p in pts) + //{ + // var fi = doc.Create + // .NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + // instances.Add(fi); + //} + //foreach (var fi in instances) + //{ + // var lp = fi.Location as LocationPoint; + // var p = lp.Point; + // foreach (var seg in segments) + // { + // var l = seg.GetCurve() as Line; + // if (l.Distance(p) - ((1 + rem) / 4 * interval) < 0.001) + // { + // if (l.Direction.X < 0.001) + // { + // fi.GetParameters("长度").FirstOrDefault().Set((1 + rem) / 2 * (interval - halfgap)); + // } + // else if (l.Direction.Y < 0.001) + // { + // fi.GetParameters("宽度").FirstOrDefault().Set((1 + rem) / 2 * (interval - halfgap)); + // } + // } + // else if (l.Distance(p) - ((1 + rem1) / 4 * interval) < 0.001) + // { + // if (l.Direction.X < 0.001) + // { + // fi.GetParameters("长度").FirstOrDefault().Set((1 + rem1) / 2 * (interval - halfgap)); + // } + // else if (l.Direction.Y < 0.001) + // { + // fi.GetParameters("宽度").FirstOrDefault().Set((1 + rem1) / 2 * (interval - halfgap)); + // } + // } + // if (true) + // { + // } + // } + //} - //foreach (var p in pts) - //{ - // var fi = doc.Create - // .NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - // instances.Add(fi); - //} - //foreach (var fi in instances) - //{ - // var lp = fi.Location as LocationPoint; - // var p = lp.Point; - // foreach (var seg in segments) - // { - // var l = seg.GetCurve() as Line; - // if (l.Distance(p) - ((1 + rem) / 4 * interval) < 0.001) - // { - // if (l.Direction.X < 0.001) - // { - // fi.GetParameters("长度").FirstOrDefault().Set((1 + rem) / 2 * (interval - halfgap)); - // } - // else if (l.Direction.Y < 0.001) - // { - // fi.GetParameters("宽度").FirstOrDefault().Set((1 + rem) / 2 * (interval - halfgap)); - // } - // } - // else if (l.Distance(p) - ((1 + rem1) / 4 * interval) < 0.001) - // { - // if (l.Direction.X < 0.001) - // { - // fi.GetParameters("长度").FirstOrDefault().Set((1 + rem1) / 2 * (interval - halfgap)); - // } - // else if (l.Direction.Y < 0.001) - // { - // fi.GetParameters("宽度").FirstOrDefault().Set((1 + rem1) / 2 * (interval - halfgap)); - // } - // } - // if (true) - // { - // } - // } - //} + //Do Something. - //ModelCurve mc = doc.Create.NewModelCurve(); - //var geoelem = room.get_Geometry(new Options()); - //foreach (var geomObj in geoelem) - //{ - // Solid geomSolid = geomObj as Solid; - // if (null != geomSolid) - // { - // foreach (Face geomFace in geomSolid.Faces) - // { - // break; - // } - // break; - // } - //} - - //Do Something. - - #endregion MyRegion - - tg.Assimilate(); - } - catch (Autodesk.Revit.Exceptions.OperationCanceledException) - { - if (tg.GetStatus() == TransactionStatus.Started) - { - tg.RollBack(); - } - return Result.Cancelled; - } - } - return Result.Succeeded; + #endregion MyRegion + } + catch (Autodesk.Revit.Exceptions.OperationCanceledException) + { + if (tg.GetStatus() == TransactionStatus.Started) + { + tg.RollBack(); + } + return Result.Succeeded; + } + return Result.Succeeded; + }, "地面铺装"); } private List GetIntersectPoints(List curves) diff --git a/RookieStation/CmdPlaceLamps.cs b/RookieStation/CmdPlaceLamps.cs index d623c5d..0cd79ba 100644 --- a/RookieStation/CmdPlaceLamps.cs +++ b/RookieStation/CmdPlaceLamps.cs @@ -27,11 +27,11 @@ namespace RookieStation.PackAreaModule DocumentSet docset = uiapp.Application.Documents; Family family = null; FamilySymbol symbol; - double lrdistance = 0.0; - double fbdistance = 0.0; + double leftRightDistance = 0.0; + double frontDistance = 0.0; - var roomcounts = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Rooms).GetElementCount(); - if (roomcounts == 0) + var roomCount = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Rooms).GetElementCount(); + if (roomCount == 0) { TaskDialog.Show("温馨提示", "项目中当前没有房间"); return Result.Cancelled; @@ -40,8 +40,8 @@ namespace RookieStation.PackAreaModule if (placeLamps.DialogResult == true) { - lrdistance = placeLamps.LRDistance / 304.8; - fbdistance = placeLamps.LRDistance / 304.8; + leftRightDistance = placeLamps.LeftRightDistance / 304.8; + frontDistance = placeLamps.FrontDistance / 304.8; } else { @@ -49,195 +49,186 @@ namespace RookieStation.PackAreaModule } double interval = 2000 / 304.8; - using (TransactionGroup tg = new TransactionGroup(doc, "布置灯具")) - { - try - { - var v = new FilteredElementCollector(doc).OfClass(typeof(View)) - .Cast() - .FirstOrDefault(x => x.ViewType == ViewType.FloorPlan && x.GenLevel.Elevation == 0); + return doc.InvokeGroup(tg => + { + try + { + var v = new FilteredElementCollector(doc).OfClass(typeof(View)) + .Cast() + .FirstOrDefault(x => x.ViewType == ViewType.FloorPlan && x.GenLevel.Elevation == 0); - var baselevel = new FilteredElementCollector(doc) - .OfClass(typeof(Level)) - .Cast() - .FirstOrDefault(x => x.Elevation == 0); + var baseLevel = new FilteredElementCollector(doc) + .OfClass(typeof(Level)) + .Cast() + .FirstOrDefault(x => x.Elevation == 0); - List modelCurveIds = new List(); - tg.Start(); - if (uidoc.ActiveView.ViewType != ViewType.FloorPlan) - { - uidoc.RequestViewChange(v); - } + List modelCurveIds = new List(); + if (uidoc.ActiveView.ViewType != ViewType.FloorPlan) + { + uidoc.RequestViewChange(v); + } - SelectFilter selfilter = new SelectFilter(); - Reference roomrefer = uidoc.Selection.PickObject(ObjectType.Element, selfilter, "请选择房间"); - Room room = doc.GetElement(roomrefer) as Room; + SelectFilter roomFilter = new SelectFilter(); + Reference roomReference = uidoc.Selection.PickObject(ObjectType.Element, roomFilter, "请选择房间"); + Room room = doc.GetElement(roomReference) as Room; - var roompoint = RsRevitUtils.GetXYZByElement(room); + var roomLocationPoint = RsRevitUtils.GetLocationPointByElement(room); - IList segments = room.GetBoundarySegments(new SpatialElementBoundaryOptions()).FirstOrDefault(); + IList segments = room.GetBoundarySegments(new SpatialElementBoundaryOptions()).FirstOrDefault(); - using (Transaction ts = new Transaction(doc, "模型线创建")) - { - ts.Start(); - foreach (var seg in segments) - { - Curve cur = seg.GetCurve(); - Plane plane = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); - var mc = doc.Create.NewModelCurve(cur, SketchPlane.Create(doc, plane)); - modelCurveIds.Add(mc.Id); - } + doc.Invoke(ts => + { + foreach (var segment in segments) + { + Curve curve = segment.GetCurve(); + Plane plane = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); + var mc = doc.Create.NewModelCurve(curve, SketchPlane.Create(doc, plane)); + modelCurveIds.Add(mc.Id); + } + }, "模型线创建"); - ts.Commit(); - } - //Reference edge = uidoc.Selection.PickObject(ObjectType.Edge, "请选择边界"); - SelectFilter mlfilter = new SelectFilter(); - Reference refline = uidoc.Selection.PickObject(ObjectType.Element, mlfilter, "请选择基准边线"); - //模型线选取 - var ml = doc.GetElement(refline) as ModelLine; - Line line = ml.GeometryCurve as Line; - Line line1 = RsRevitUtils.GetLongestSegmentLine(segments, line); - //var m = doc.GetElement(refer.ElementId); + //Reference edge = uidoc.Selection.PickObject(ObjectType.Edge, "请选择边界"); + SelectFilter mlfilter = new SelectFilter(); + Reference referline = uidoc.Selection.PickObject(ObjectType.Element, mlfilter, "请选择基准边线"); + //模型线选取 + var ml = doc.GetElement(referline) as ModelLine; + Line line = ml.GeometryCurve as Line; + Line line1 = RsRevitUtils.GetLongestSegmentLine(segments, line); + //var m = doc.GetElement(refer.ElementId); - XYZ basepoint = uidoc.Selection.PickPoint(UserConstant.SnapAll, "请选择基准点（位于基准线上）"); - double alength = basepoint.DistanceTo(line.GetEndPoint(0)) + basepoint.DistanceTo(line.GetEndPoint(1)); - if (line.Length - alength > 0.001) - { - System.Windows.MessageBox.Show("请选择基准线上的点", "温馨提示"); - return Result.Cancelled; - } - //if (basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(0)) || basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(1))) - //{ - //} - var endp1 = line.GetEndPoint(0); - var endp2 = line.GetEndPoint(1); - var v1 = endp1 - basepoint; - var v2 = endp2 - basepoint; - var v0 = roompoint - basepoint; - List curves = new List(); - List instances = new List(); - //Curve currefer = null; - //Curve currefer1 = null; + XYZ basePoint = uidoc.Selection.PickPoint(UserConstant.SnapAll, "请选择基准点（位于基准线上）"); + double lengthCount = basePoint.DistanceTo(line.GetEndPoint(0)) + basePoint.DistanceTo(line.GetEndPoint(1)); + if (line.Length - lengthCount > 0.001) + { + System.Windows.MessageBox.Show("请选择基准线上的点", "温馨提示"); + return Result.Cancelled; + } + //if (basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(0)) || basepoint.IsAlmostEqualTo(ml.GeometryCurve.GetEndPoint(1))) + //{ + //} + var endpoint1 = line.GetEndPoint(0); + var endpoint2 = line.GetEndPoint(1); + var v1 = endpoint1 - basePoint; + var v2 = endpoint2 - basePoint; + var v0 = roomLocationPoint - basePoint; + List curves = new List(); + List instances = new List(); + //Curve currefer = null; + //Curve currefer1 = null; - List pts = new List(); - List lastps = new List(); - XYZ zdir1 = null; - XYZ zdir2 = null; - XYZ offestvector = null; + List pts = new List(); + List lastps = new List(); + XYZ zdir1 = null; + XYZ zdir2 = null; + XYZ offestVector = null; - if (!v1.IsAlmostEqualTo(XYZ.Zero) && endp1.DistanceTo(basepoint) > interval) - { - //if (endp1.DistanceTo(basepoint) < interval) - //{ - // System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); - // return Result.Cancelled; - //} - zdir1 = v1.CrossProduct(v0).Normalize(); - //偏移的方向，直线的侧方向 - offestvector = zdir1.CrossProduct(v1).Normalize(); - Line l1 = Line.CreateBound(basepoint, line.GetEndPoint(0)); + if (!v1.IsAlmostEqualTo(XYZ.Zero) && endpoint1.DistanceTo(basePoint) > interval) + { + //if (endp1.DistanceTo(basepoint) < interval) + //{ + // System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); + // return Result.Cancelled; + //} + zdir1 = v1.CrossProduct(v0).Normalize(); + //偏移的方向，直线的侧方向 + offestVector = zdir1.CrossProduct(v1).Normalize(); + Line l1 = Line.CreateBound(basePoint, line.GetEndPoint(0)); - for (int i = 0; i < 1000; i++) - { - var parameter = i * interval; - if (!l1.IsInside(parameter + lrdistance + interval / 2)) - { - break; - } - XYZ p = l1.Evaluate(parameter, false); - XYZ finalpoint = p + (l1.Direction * interval / 2) + (offestvector * fbdistance); - if (v2.IsAlmostEqualTo(XYZ.Zero)) - { - finalpoint = p + (l1.Direction * lrdistance) + (offestvector * fbdistance); - } + for (int i = 0; i < 1000; i++) + { + var parameter = i * interval; + if (!l1.IsInside(parameter + leftRightDistance + interval / 2)) + { + break; + } + XYZ p = l1.Evaluate(parameter, false); + XYZ finalPoint = p + (l1.Direction * interval / 2) + (offestVector * frontDistance); + if (v2.IsAlmostEqualTo(XYZ.Zero)) + { + finalPoint = p + (l1.Direction * leftRightDistance) + (offestVector * frontDistance); + } - pts.Add(finalpoint); - } - } + pts.Add(finalPoint); + } + } - if (!v2.IsAlmostEqualTo(XYZ.Zero) && endp2.DistanceTo(basepoint) > interval) - { - //if (endp2.DistanceTo(basepoint) < length) - //{ - // System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); - // return Result.Cancelled; - //} - zdir2 = v2.CrossProduct(v0).Normalize(); - offestvector = zdir2.CrossProduct(v2).Normalize(); - var x = zdir2.CrossProduct(v2); - Line l2 = Line.CreateBound(basepoint, line.GetEndPoint(1)); + if (!v2.IsAlmostEqualTo(XYZ.Zero) && endpoint2.DistanceTo(basePoint) > interval) + { + //if (endp2.DistanceTo(basepoint) < length) + //{ + // System.Windows.MessageBox.Show("基准点与基准线端点距离太近"); + // return Result.Cancelled; + //} + zdir2 = v2.CrossProduct(v0).Normalize(); + offestVector = zdir2.CrossProduct(v2).Normalize(); + var x = zdir2.CrossProduct(v2); + Line l2 = Line.CreateBound(basePoint, line.GetEndPoint(1)); - for (int i = 0; i < 1000; i++) - { - var parameter = i * interval; - if (!l2.IsInside(parameter + lrdistance + interval / 2)) - { - break; - } - XYZ p = l2.Evaluate(parameter, false); - //附加的基准线的水平垂直偏移距离 - var finalpoint = p + (l2.Direction * interval / 2) + (offestvector * fbdistance); - if (v1.IsAlmostEqualTo(XYZ.Zero)) - { - finalpoint = p + (l2.Direction * lrdistance) + (offestvector * fbdistance); - } + for (int i = 0; i < 1000; i++) + { + var parameter = i * interval; + if (!l2.IsInside(parameter + leftRightDistance + interval / 2)) + { + break; + } + XYZ p = l2.Evaluate(parameter, false); + //附加的基准线的水平垂直偏移距离 + var finalpoint = p + (l2.Direction * interval / 2) + (offestVector * frontDistance); + if (v1.IsAlmostEqualTo(XYZ.Zero)) + { + finalpoint = p + (l2.Direction * leftRightDistance) + (offestVector * frontDistance); + } - pts.Add(finalpoint); - } - //var lastl2 = pts.Last().DistanceTo(endp2); - } + pts.Add(finalpoint); + } + //var lastl2 = pts.Last().DistanceTo(endp2); + } - using (Transaction trans = new Transaction(doc, "载入布置灯具")) - { - trans.Start(); - //删除模型线 - doc.Delete(modelCurveIds); - family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\成品吊灯.rfa"); - ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); - symbol = doc.GetElement(symbolId) as FamilySymbol; - symbol.Activate(); - foreach (var p in pts) - { - var fi = doc.Create - .NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(fi); - } - foreach (var p in lastps) - { - var fi = doc.Create - .NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(fi); - } - trans.Commit(); - } - using (Transaction trans = new Transaction(doc, "复制灯具")) - { - trans.Start(); - for (int i = 0; i < instances.Count; i++) - { - FamilyInstance fi = instances[i]; - int num = (int)Math.Floor((line1.Length - 2 * fbdistance) / interval); - double rem = line1.Length - num * interval; - for (int j = 1; j <= num; j++) - { - ElementTransformUtils.CopyElement(doc, fi.Id, offestvector * interval * j); - } - } - trans.Commit(); - } - - tg.Assimilate(); - } - catch (Autodesk.Revit.Exceptions.OperationCanceledException) - { - if (tg.GetStatus() == TransactionStatus.Started) - { - tg.RollBack(); - } - return Result.Cancelled; - } - } - return Result.Succeeded; + doc.Invoke(ts => + { + //删除模型线 + doc.Delete(modelCurveIds); + family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\成品吊灯.rfa"); + ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); + symbol = doc.GetElement(symbolId) as FamilySymbol; + symbol.Activate(); + foreach (var p in pts) + { + var fi = doc.Create + .NewFamilyInstance(p, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(fi); + } + foreach (var p in lastps) + { + var fi = doc.Create + .NewFamilyInstance(p, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instances.Add(fi); + } + }, "载入布置灯具"); + doc.Invoke(ts => + { + for (int i = 0; i < instances.Count; i++) + { + FamilyInstance fi = instances[i]; + int num = (int)Math.Floor((line1.Length - 2 * frontDistance) / interval); + double rem = line1.Length - num * interval; + for (int j = 1; j <= num; j++) + { + ElementTransformUtils.CopyElement(doc, fi.Id, offestVector * interval * j); + } + } + }, "复制灯具"); + } + catch (Autodesk.Revit.Exceptions.OperationCanceledException) + { + //if (tg.GetStatus() == TransactionStatus.Started) + //{ + // tg.RollBack(); + //} + return Result.Succeeded; + } + return Result.Succeeded; + }, "布置灯具"); } } } \ No newline at end of file diff --git a/RookieStation/CmdPlaceReceptionArea.cs b/RookieStation/CmdPlaceReceptionArea.cs index 1b3130f..116ed0d 100644 --- a/RookieStation/CmdPlaceReceptionArea.cs +++ b/RookieStation/CmdPlaceReceptionArea.cs @@ -49,93 +49,96 @@ namespace RookieStation.ShippingAreaModule WpfReceptionArea receptionAreaPlacement = CommonUtils.GenerateWindow(); //初始值 //基层厚度 - double base_layer_thickness = 15 / 304.8; + double baseLayerThickness = 15 / 304.8; //踢脚线高度 - double Skirting_line_height = 50 / 304.8; + double skirtingLineHeight = 50 / 304.8; //踢脚线厚度 - double Skirting_line_thickness = 1.2 / 304.8; + double skirtingLineThickness = 1.2 / 304.8; //铝塑板长度 - double aluminum_plastic_panel_length = 1220 / 304.8; + double aluminumPlasticPanelLength = 0; //铝塑板高度 - double aluminum_plastic_panel_height = 2400 / 304.8; + double aluminumPlasticPanelHeight = 0; //铝塑板厚度 - double aluminum_plastic_panel_thickness = 3 / 304.8; + double aluminumPlasticPanelThickness = 3 / 304.8; //分缝 double gap = 2 / 304.8; //灰色乳胶漆厚度 - double grey_emulsion_paint_width = 1 / 304.8; + double greyEmulsionPaintWidth = 1 / 304.8; //发光字族类型 - string glow_text_symbol; + string glowTextSymbol; //墙间距 - double lamps_wall_distance = 900 / 304.8; + double lampsWallDistance = 0; //灯间距 - double lamps_interval = 900 / 304.8; + double lampsInterval = 0; + //灯高度 + double lampsHeight = 0; if (receptionAreaPlacement.DialogResult == true) { //铝塑板长度 - aluminum_plastic_panel_length = receptionAreaPlacement.aluminump_lastic_panel_length / 304.8; + aluminumPlasticPanelLength = receptionAreaPlacement.AluminumpLasticPanelLength / 304.8; //铝塑板高度 - aluminum_plastic_panel_height = receptionAreaPlacement.aluminump_lastic_panel_height / 304.8; + aluminumPlasticPanelHeight = receptionAreaPlacement.AluminumpLasticPanelHeight / 304.8; //分缝 - gap = receptionAreaPlacement.aluminump_lastic_panel_gap / 304.8; + gap = receptionAreaPlacement.AluminumpLasticPanelGgap / 304.8; - glow_text_symbol = receptionAreaPlacement.glow_text_symbol; + glowTextSymbol = receptionAreaPlacement.GlowTextSymbol; - lamps_wall_distance = receptionAreaPlacement.lamp_wall_distance / 304.8; - lamps_interval = receptionAreaPlacement.lamps_interval / 304.8; + lampsWallDistance = receptionAreaPlacement.LampWallDistance / 304.8; + lampsInterval = receptionAreaPlacement.LampsInterval / 304.8; + lampsHeight = receptionAreaPlacement.LampsHeight / 304.8; } else { return Result.Cancelled; } - Level baselevel = uidoc.ActiveView.GenLevel; + Level baseLevel = uidoc.ActiveView.GenLevel; Family family = null; FamilySymbol symbol; return doc.InvokeGroup(tg => { try { - FamilySymbol linesymbol = RsRevitUtils.GetGuideSymbol(doc); + FamilySymbol guideSymbol = RsRevitUtils.GetGuideSymbol(doc); eleIdsAdded.Clear(); uiapp.Application.DocumentChanged += Application_DocumentChanged; - uidoc.PromptForFamilyInstancePlacement(linesymbol); + uidoc.PromptForFamilyInstancePlacement(guideSymbol); uiapp.Application.DocumentChanged -= Application_DocumentChanged; //在此处无法取消订阅 //uiapp.Application.DocumentChanged -= Application_DocumentChanged; } catch (Autodesk.Revit.Exceptions.OperationCanceledException) { - var interval = gap + aluminum_plastic_panel_length; + var interval = gap + aluminumPlasticPanelLength; if (eleIdsAdded.Count == 0) { return Result.Cancelled; } - Line refer_line = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); + Line referline = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); uiapp.Application.DocumentChanged -= Application_DocumentChanged; - double backgroundwall_length = refer_line.Length; - if (backgroundwall_length < 1500 / 304.8) + double backgroundWallLength = referline.Length; + if (backgroundWallLength < 1500 / 304.8) { TaskDialog.Show("温馨提示", "距离太接"); return Result.Cancelled; } - List wallids = new List(); - WallType base_layer_type = null; - base_layer_thickness = RsRevitUtils.GetWallWidthByWallTypeName(doc, "阻燃板", out base_layer_type); + List wallIds = new List(); + WallType baseLayerType = null; + baseLayerThickness = RsRevitUtils.GetWallWidthByWallTypeName(doc, "阻燃板", out baseLayerType); - WallType grey_emulsion_paint_type = null; - grey_emulsion_paint_width = RsRevitUtils.GetWallWidthByWallTypeName(doc, "灰色乳胶漆", out grey_emulsion_paint_type); + WallType greyEmulsionPaintType = null; + greyEmulsionPaintWidth = RsRevitUtils.GetWallWidthByWallTypeName(doc, "灰色乳胶漆", out greyEmulsionPaintType); - WallType aluminum_plastic_panel_type = null; - aluminum_plastic_panel_thickness = RsRevitUtils.GetWallWidthByWallTypeName(doc, "铝塑板", out aluminum_plastic_panel_type); + WallType aluminumPlasticPanelType = null; + aluminumPlasticPanelThickness = RsRevitUtils.GetWallWidthByWallTypeName(doc, "铝塑板", out aluminumPlasticPanelType); - WallType Skirting_line_type = null; - Skirting_line_thickness = RsRevitUtils.GetWallWidthByWallTypeName(doc, "踢脚线", out Skirting_line_type); + WallType skirtingLineType = null; + skirtingLineThickness = RsRevitUtils.GetWallWidthByWallTypeName(doc, "踢脚线", out skirtingLineType); //铝塑板块数 - int n = (int)Math.Floor(refer_line.Length / interval); - double rem = refer_line.Length % (gap + aluminum_plastic_panel_length); - if (base_layer_type == null || aluminum_plastic_panel_type == null || Skirting_line_type == null || grey_emulsion_paint_type == null) + int n = (int)Math.Floor(referline.Length / interval); + double rem = referline.Length % (gap + aluminumPlasticPanelLength); + if (baseLayerType == null || aluminumPlasticPanelType == null || skirtingLineType == null || greyEmulsionPaintType == null) { TaskDialog.Show("温馨提示", "需要新建装饰所需的墙类型，类型名称需分别包含阻燃板，灰色乳胶漆，铝塑板，踢脚线"); return Result.Cancelled; @@ -145,76 +148,51 @@ namespace RookieStation.ShippingAreaModule //长度不满足设置的铝塑板长度时 if (n == 0) { - var offestline = refer_line.CreateOffset(aluminum_plastic_panel_thickness / 2 + base_layer_thickness, -XYZ.BasisZ); - var wall = Wall.Create(doc, offestline, aluminum_plastic_panel_type.Id, doc.ActiveView.GenLevel.Id, aluminum_plastic_panel_height, Skirting_line_height, false, false); - wallids.Add(wall.Id); + var offestline = referline.CreateOffset(aluminumPlasticPanelThickness / 2 + baseLayerThickness, -XYZ.BasisZ); + var wall = Wall.Create(doc, offestline, aluminumPlasticPanelType.Id, doc.ActiveView.GenLevel.Id, aluminumPlasticPanelHeight, skirtingLineHeight, false, false); + wallIds.Add(wall.Id); } else { for (int i = 0; i < n + 1; i++) { - var startpoint = refer_line.Evaluate(i * interval, false); - var endpoint = refer_line.Evaluate(((i + 1) * interval) - gap, false); + var startpoint = referline.Evaluate(i * interval, false); + var endpoint = referline.Evaluate(((i + 1) * interval) - gap, false); if (i == n) { - endpoint = refer_line.GetEndPoint(1); + endpoint = referline.GetEndPoint(1); } Line line = Line.CreateBound(startpoint, endpoint); - var offestline = line.CreateOffset(aluminum_plastic_panel_thickness / 2 + base_layer_thickness, -XYZ.BasisZ); - var wall = Wall.Create(doc, offestline, aluminum_plastic_panel_type.Id, doc.ActiveView.GenLevel.Id, aluminum_plastic_panel_height, Skirting_line_height, false, false); + var offestline = line.CreateOffset(aluminumPlasticPanelThickness / 2 + baseLayerThickness, -XYZ.BasisZ); + var wall = Wall.Create(doc, offestline, aluminumPlasticPanelType.Id, doc.ActiveView.GenLevel.Id, aluminumPlasticPanelHeight, skirtingLineHeight, false, false); //不允许连接 WallUtils.DisallowWallJoinAtEnd(wall, 0); //curves.Add() - wallids.Add(wall.Id); + wallIds.Add(wall.Id); } } - var skirting_offestline = refer_line.CreateOffset(Skirting_line_thickness / 2 + base_layer_thickness, -XYZ.BasisZ); - var skirtingwall = Wall.Create(doc, skirting_offestline, Skirting_line_type.Id, doc.ActiveView.GenLevel.Id, Skirting_line_height, 0, false, false); - wallids.Add(skirtingwall.Id); + var skirtingOffestLine = referline.CreateOffset(skirtingLineThickness / 2 + baseLayerThickness, -XYZ.BasisZ); + var skirtingwall = Wall.Create(doc, skirtingOffestLine, skirtingLineType.Id, doc.ActiveView.GenLevel.Id, skirtingLineHeight, 0, false, false); + wallIds.Add(skirtingwall.Id); - var base_layer_offestline = refer_line.CreateOffset(base_layer_thickness / 2, -XYZ.BasisZ); - var baselayerwall = Wall.Create(doc, base_layer_offestline, base_layer_type.Id, doc.ActiveView.GenLevel.Id, UserConstant.Height / 304.8, 0, false, false); - wallids.Add(baselayerwall.Id); + var baseLayerOffestLine = referline.CreateOffset(baseLayerThickness / 2, -XYZ.BasisZ); + var baseLayerWall = Wall.Create(doc, baseLayerOffestLine, baseLayerType.Id, doc.ActiveView.GenLevel.Id, UserConstant.Height / 304.8, 0, false, false); + wallIds.Add(baseLayerWall.Id); //高度大于3000才有灰色乳胶漆 if (UserConstant.Height > 3000) { - double baseheight = aluminum_plastic_panel_height + Skirting_line_height; - var grey_emulsion_paint_offestline = refer_line.CreateOffset(base_layer_thickness + grey_emulsion_paint_width / 2, -XYZ.BasisZ); - var greypaintwall = Wall.Create(doc, grey_emulsion_paint_offestline, grey_emulsion_paint_type.Id, doc.ActiveView.GenLevel.Id, UserConstant.Height / 304.8 - baseheight, baseheight, false, false); - wallids.Add(greypaintwall.Id); + double baseHeight = aluminumPlasticPanelHeight + skirtingLineHeight; + var greyEmulsionPaintOffestLine = referline.CreateOffset(baseLayerThickness + greyEmulsionPaintWidth / 2, -XYZ.BasisZ); + Wall greyPaintWall = Wall.Create(doc, greyEmulsionPaintOffestLine, greyEmulsionPaintType.Id, doc.ActiveView.GenLevel.Id, UserConstant.Height / 304.8 - baseHeight, baseHeight, false, false); + wallIds.Add(greyPaintWall.Id); } doc.Regenerate(); - doc.Create.NewGroup(wallids); + doc.Create.NewGroup(wallIds); }, "背景墙创建"); - //SelectFilter wallfilter = new SelectFilter(); - //var wallrefer = uidoc.Selection.PickObject(ObjectType.Element, wallfilter, "请选择作为背景墙的墙体"); - //var wall = doc.GetElement(wallrefer) as Wall; - - //WallFaceSelectionFilter selfilter = new WallFaceSelectionFilter(wall.Id); - //var facerefer = uidoc.Selection.PickObject(ObjectType.Face, selfilter, "请选择要装饰的墙面"); - - //PlanarFace pf = wall.GetGeometryObjectFromReference(facerefer) as PlanarFace; - - //XYZ normal = pf.FaceNormal; - //XYZ p1 = uidoc.Selection.PickObject(ObjectType.PointOnElement, selfilter, "请选取背景墙左侧端点").GlobalPoint; - - //XYZ p2 = uidoc.Selection.PickObject(ObjectType.PointOnElement, selfilter, "请选取背景墙右侧端点").GlobalPoint; - - //XYZ p1 = uidoc.Selection.PickPoint(UserConstant.SnapAll, "请选取背景墙左侧端点"); - //XYZ p2 = uidoc.Selection.PickPoint(UserConstant.SnapAll, "请选取背景墙右侧端点"); - - //两点的水平距离 - - //if (UserConstant.Height / 3 * 2 < 2200) - //{ - // TaskDialog.Show("温馨提示", "层高设置有误"); - // return Result.Cancelled; - //} - #region 菜鸟使命布置 FamilyInstance signage = null; @@ -225,27 +203,22 @@ namespace RookieStation.ShippingAreaModule symbol = doc.GetElement(symbolId) as FamilySymbol; symbol.Activate(); - //var x = family.FamilyPlacementType; - //signage = doc.Create.NewFamilyInstance(facerefer, p2 + new XYZ(0, 0, height + 100 / 304.8), symbol, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + var endPoint = referline.GetEndPoint(0); - var endpoint = refer_line.GetEndPoint(0); - - endpoint += (Skirting_line_height + aluminum_plastic_panel_height) * XYZ.BasisZ; - signage = doc.Create.NewFamilyInstance(endpoint, symbol, StructuralType.NonStructural); + endPoint += (skirtingLineHeight + aluminumPlasticPanelHeight) * XYZ.BasisZ; + signage = doc.Create.NewFamilyInstance(endPoint, symbol, StructuralType.NonStructural); //标准面要朝上，族要面向背侧 - - //symbol.GetParameters("背景墙长度").FirstOrDefault().Set(distance); }, "菜鸟的使命"); doc.Invoke(ts => { //族的正面要超前 - RsRevitUtils.AdjustInstance(doc, signage, refer_line, grey_emulsion_paint_width + base_layer_thickness); + RsRevitUtils.AdjustInstance(doc, signage, referline, greyEmulsionPaintWidth + baseLayerThickness); }, "调整菜鸟使命"); #endregion 菜鸟使命布置 - double reception_length = refer_line.Length / 3 * 2; - double reception_wall_distance = 1000 / 304.8; + double receptionLength = referline.Length / 3 * 2; + double receptionWallDistance = 1000 / 304.8; FamilyInstance reception = null; doc.Invoke(ts => { @@ -253,48 +226,48 @@ namespace RookieStation.ShippingAreaModule ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); symbol = doc.GetElement(symbolId) as FamilySymbol; symbol.Activate(); - var wall_center_point = refer_line.Evaluate(0.5, true); + var wallCenterPoint = referline.Evaluate(0.5, true); - reception = doc.Create.NewFamilyInstance(wall_center_point, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + reception = doc.Create.NewFamilyInstance(wallCenterPoint, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - symbol.GetParameters("台面长度").FirstOrDefault().Set(reception_length); + symbol.GetParameters("台面长度").FirstOrDefault().Set(receptionLength); //symbol.GetParameters("台面长度").FirstOrDefault().AsDouble(); }, "接待台布置"); doc.Invoke(ts => { - RsRevitUtils.AdjustInstance(doc, reception, refer_line, reception_wall_distance); + RsRevitUtils.AdjustInstance(doc, reception, referline, receptionWallDistance); }, "调整接待台"); FamilyInstance logo = null; doc.Invoke(ts => { family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Sign\\菜鸟LOGO.rfa"); - ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(id => doc.GetElement(id).Name == glow_text_symbol); + ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(id => doc.GetElement(id).Name == glowTextSymbol); symbol = doc.GetElement(symbolId) as FamilySymbol; symbol.Activate(); - var wall_center_point = refer_line.Evaluate(0.5, true); + var wallCenterPoint = referline.Evaluate(0.5, true); - logo = doc.Create.NewFamilyInstance(wall_center_point, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + logo = doc.Create.NewFamilyInstance(wallCenterPoint, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); //symbol.GetParameters("背景墙长度").FirstOrDefault().Set(reception_length); //width = symbol.GetParameters("台面宽度").FirstOrDefault().AsDouble(); }, "菜鸟LOG布置"); doc.Invoke(ts => { - RsRevitUtils.AdjustInstance(doc, logo, refer_line, aluminum_plastic_panel_thickness + base_layer_thickness); + RsRevitUtils.AdjustInstance(doc, logo, referline, aluminumPlasticPanelThickness + baseLayerThickness); }, "调整lOGO"); doc.Invoke(ts => { - family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\圆形吊灯.rfa"); + family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Lamp\\吊灯.rfa"); ElementId symbolId = family.GetFamilySymbolIds().FirstOrDefault(); symbol = doc.GetElement(symbolId) as FamilySymbol; symbol.Activate(); - var normal_direction = refer_line.Direction; - List lamp_location_points = new List(); - var lamps_location_line = refer_line.CreateOffset(lamps_wall_distance, -XYZ.BasisZ); - var center_point = lamps_location_line.Evaluate(0.5, true); - n = (int)Math.Floor(backgroundwall_length / lamps_interval); + var referlineDirection = referline.Direction; + List lampLocationPoints = new List(); + var lampsLocationLine = referline.CreateOffset(lampsWallDistance, -XYZ.BasisZ); + var centerPoint = lampsLocationLine.Evaluate(0.5, true); + n = (int)Math.Floor(backgroundWallLength / lampsInterval); //单侧的数量 int m = (int)Math.Floor((n + 1.0) / 2); if ((n + 1) % 2 == 0) @@ -302,48 +275,34 @@ namespace RookieStation.ShippingAreaModule //开始间隔为0.5 for (int i = 0; i < m; i++) { - XYZ p = center_point.Add(normal_direction * (i + 0.5) * lamps_interval); - XYZ reversep = center_point.Add(-normal_direction * (i + 0.5) * lamps_interval); + XYZ p = centerPoint.Add(referlineDirection * (i + 0.5) * lampsInterval) + XYZ.BasisZ * lampsHeight; + XYZ reversePoint = centerPoint.Add(-referlineDirection * (i + 0.5) * lampsInterval) + XYZ.BasisZ * lampsHeight; - lamp_location_points.Add(p); - lamp_location_points.Add(reversep); + lampLocationPoints.Add(p); + lampLocationPoints.Add(reversePoint); } - foreach (XYZ p in lamp_location_points) + foreach (XYZ p in lampLocationPoints) { - doc.Create.NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + doc.Create.NewFamilyInstance(p, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); } } else { - lamp_location_points.Add(center_point); + lampLocationPoints.Add(centerPoint); //i=0时居中，不在单侧,开始间隔为1 for (int i = 0; i < m; i++) { - XYZ p = center_point.Add(normal_direction * (i + 1) * lamps_interval); - XYZ reversep = center_point.Add(-normal_direction * (i + 1) * lamps_interval); - lamp_location_points.Add(p); - lamp_location_points.Add(reversep); + XYZ p = centerPoint.Add(referlineDirection * (i + 1) * lampsInterval); + XYZ reversePoint = centerPoint.Add(-referlineDirection * (i + 1) * lampsInterval); + lampLocationPoints.Add(p); + lampLocationPoints.Add(reversePoint); } - foreach (XYZ p in lamp_location_points) + foreach (XYZ p in lampLocationPoints) { - doc.Create.NewFamilyInstance(p, symbol, baselevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + doc.Create.NewFamilyInstance(p, symbol, baseLevel, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); } } }, "吊灯布置"); - - //doc.Invoke(ts => - //{ - // if (backgroundwall.CanFlipFacing && backgroundwall.CanFlipHand && !backgroundwall.FacingOrientation.IsAlmostEqualTo(normal)) - // { - // backgroundwall.flipFacing(); - // backgroundwall.flipHand(); - // } - // if (frontdesk.CanFlipFacing && backgroundwall.CanFlipHand && !frontdesk.FacingOrientation.IsAlmostEqualTo(normal)) - // { - // frontdesk.flipFacing(); - // frontdesk.flipHand(); - // } - //}, "调整"); } return Result.Succeeded; @@ -392,37 +351,17 @@ namespace RookieStation.ShippingAreaModule private Reference GetWallSideFaceReference(Wall wall, XYZ normal) { - var facerefer = HostObjectUtils.GetSideFaces(wall, ShellLayerType.Interior).FirstOrDefault(); - var facerefer1 = HostObjectUtils.GetSideFaces(wall, ShellLayerType.Exterior).FirstOrDefault(); + var interFaceReference = HostObjectUtils.GetSideFaces(wall, ShellLayerType.Interior).FirstOrDefault(); + var exterFaceReference = HostObjectUtils.GetSideFaces(wall, ShellLayerType.Exterior).FirstOrDefault(); - PlanarFace pf = wall.GetGeometryObjectFromReference(facerefer) as PlanarFace; + PlanarFace pf = wall.GetGeometryObjectFromReference(interFaceReference) as PlanarFace; if (pf.FaceNormal.IsAlmostEqualTo(normal)) { - return facerefer; + return interFaceReference; } else { - return facerefer1; - } - } - - public class WallFaceSelectionFilter : ISelectionFilter - { - private ElementId eid = null; - - public WallFaceSelectionFilter(ElementId elementId) - { - eid = elementId; - } - - public bool AllowElement(Element element) - { - return element is Wall && eid == element.Id; - } - - public bool AllowReference(Reference refer, XYZ point) - { - return true; + return exterFaceReference; } } } diff --git a/RookieStation/CmdPlaceShelves.cs b/RookieStation/CmdPlaceShelves.cs index 6d7f209..b03451a 100644 --- a/RookieStation/CmdPlaceShelves.cs +++ b/RookieStation/CmdPlaceShelves.cs @@ -73,126 +73,126 @@ namespace RookieStation.PackAreaModule { return Result.Cancelled; } - Line refer_line = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); + Line referline = RsRevitUtils.GetGuideGeometryAndDeleteGuide(doc, eleIdsAdded); uiapp.Application.DocumentChanged -= Application_DocumentChanged; //始终位于左侧,Z轴朝上 - var zaxis = XYZ.BasisZ; - Family shelf_family = null; - FamilySymbol shelf_symbol = null; - double shelf_spacing = vm.Spacing / 304.8; + var zAxis = XYZ.BasisZ; + Family shelfFamily = null; + FamilySymbol shelfSymbol = null; + double shelfSpacing = vm.ShelfSpacing / 304.8; //通道宽度 - double passage_width = vm.PassageWidth / 304.8; - double parallel_referline_offest = vm.ParalelReferOffest / 304.8; - double vertical_referline_offest = vm.VerticalReferOffest / 304.8; + double passageWidth = vm.PassageWidth / 304.8; + double parallelReferlineOffest = vm.ParallelReferlineOffest / 304.8; + double verticalReferlineOffest = vm.VerticalReferlineOffest / 304.8; for (int i = 0; i < shelves.Count; i++) { //List all_points = new List(); - List first_row_points = new List(); + List firstRowPoints = new List(); Shelf shelf = shelves[i]; - double shelf_width = shelf.Width / 304.8; - double line_parameter = 0.0; + double shelfWidth = shelf.Width / 304.8; + double lineParameter = 0.0; int n = 100;//循环次数 - XYZ p = XYZ.Zero; + XYZ pointOnReferline = XYZ.Zero; - if (parallel_referline_offest < 0.001)//起点无间距 + if (parallelReferlineOffest < 0.001)//起点无间距 { for (int j = 0; j < n; j++) { - if (!refer_line.IsInside((line_parameter + shelf_width))) + if (!referline.IsInside((lineParameter + shelfWidth))) { break; } if (j % 2 == 0) { - p = refer_line.Evaluate(line_parameter, false); - line_parameter += shelf_spacing + shelf_width; + pointOnReferline = referline.Evaluate(lineParameter, false); + lineParameter += shelfSpacing + shelfWidth; } else { - p = refer_line.Evaluate(line_parameter, false); - line_parameter += shelf_width; + pointOnReferline = referline.Evaluate(lineParameter, false); + lineParameter += shelfWidth; } - first_row_points.Add(p); + firstRowPoints.Add(pointOnReferline); } } else//起点有距离 { - line_parameter = parallel_referline_offest; + lineParameter = parallelReferlineOffest; for (int j = 0; j < n; j++) { - if (!refer_line.IsInside(line_parameter + shelf_width)) + if (!referline.IsInside(lineParameter + shelfWidth)) { break; } if (j % 2 == 0) { - p = refer_line.Evaluate(line_parameter, false); - line_parameter += shelf_width; + pointOnReferline = referline.Evaluate(lineParameter, false); + lineParameter += shelfWidth; } else { - p = refer_line.Evaluate(line_parameter, false); - line_parameter += shelf_spacing + shelf_width; + pointOnReferline = referline.Evaluate(lineParameter, false); + lineParameter += shelfSpacing + shelfWidth; } - first_row_points.Add(p); + firstRowPoints.Add(pointOnReferline); } } double l = shelf.Length / 304.8; - XYZ normal_vertical_offest_vector = zaxis.CrossProduct(refer_line.Direction).Normalize(); + XYZ normalVerticalOffestVector = zAxis.CrossProduct(referline.Direction).Normalize(); List instances = new List(); - XYZ final_point = XYZ.Zero; + XYZ finalPoint = XYZ.Zero; doc.Invoke(ts => { - shelf_family = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Shelf\\单联货架.rfa"); - var shelf_symbol_ids = shelf_family.GetFamilySymbolIds(); - foreach (var id in shelf_symbol_ids) + shelfFamily = RsRevitUtils.GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "Shelf\\单联货架.rfa"); + var shelfSymbolIds = shelfFamily.GetFamilySymbolIds(); + foreach (var id in shelfSymbolIds) { - FamilySymbol temp_symbol = doc.GetElement(id) as FamilySymbol; - if (temp_symbol.Name == shelf.SymbolName) + FamilySymbol tempSymbol = doc.GetElement(id) as FamilySymbol; + if (tempSymbol.Name == shelf.SymbolName) { - shelf_symbol = temp_symbol; + shelfSymbol = tempSymbol; break; } } - shelf_symbol.Activate(); + shelfSymbol.Activate(); }, "加载货架，激活类型"); switch (shelf.NumOfGroup) { case NumOfGroup.Single: - for (int j = 0; j < first_row_points.Count; j++) + for (int j = 0; j < firstRowPoints.Count; j++) { - XYZ pt = first_row_points[j]; - XYZ offest_direction = normal_vertical_offest_vector * (vertical_referline_offest + l / 2); + XYZ tempPoint = firstRowPoints[j]; + XYZ offestVector = normalVerticalOffestVector * (verticalReferlineOffest + l / 2); //垂直基准线平移 平行基准线平移 - final_point = pt + offest_direction + refer_line.Direction * shelf_width / 2; + finalPoint = tempPoint + offestVector + referline.Direction * shelfWidth / 2; //附加通道和（单联、多联）货架长度的偏移 if (i > 0) { - double total_length = GetTotalLength(shelves, i); + double totalLength = GetTotalLength(shelves, i); //附加排在前面通道和所有货架的长度 - XYZ additional_dir = normal_vertical_offest_vector * (i * passage_width + total_length); - final_point += additional_dir; + XYZ additional_dir = normalVerticalOffestVector * (i * passageWidth + totalLength); + finalPoint += additional_dir; } FamilyInstance instance = null; //all_points.Add(final_point); doc.Invoke(ts => { - instance = doc.Create.NewFamilyInstance(final_point, shelf_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + instance = doc.Create.NewFamilyInstance(finalPoint, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); instances.Add(instance); }, "创建货架"); //位于直线右侧时，需要进行左右翻转 doc.Invoke(ts => { - if (parallel_referline_offest < 0.001) + if (parallelReferlineOffest < 0.001) { if (j % 2 != 0 && instance.CanFlipHand) { @@ -213,49 +213,49 @@ namespace RookieStation.PackAreaModule case NumOfGroup.Double: - for (int j = 0; j < first_row_points.Count; j++) + for (int j = 0; j < firstRowPoints.Count; j++) { - XYZ pt = first_row_points[j]; + XYZ tempPoint = firstRowPoints[j]; //偏移距离 - XYZ offest_direction = normal_vertical_offest_vector * (vertical_referline_offest + l); + XYZ offestVector = normalVerticalOffestVector * (verticalReferlineOffest + l); //基础偏移距离，移动半个长度到直线的一侧，垂直基准线平移 平行基准线平移 - final_point = pt + offest_direction + refer_line.Direction * shelf_width / 2; + finalPoint = tempPoint + offestVector + referline.Direction * shelfWidth / 2; //附加通道和（单联、多联）货架长度的偏移 if (i > 0) { double totallength = GetTotalLength(shelves, i); - XYZ additionaldir = normal_vertical_offest_vector * (i * passage_width + totallength); - final_point += additionaldir; + XYZ additionaldir = normalVerticalOffestVector * (i * passageWidth + totallength); + finalPoint += additionaldir; } - FamilyInstance end_instance = null; - FamilyInstance start_instance = null; + FamilyInstance endInstance = null; + FamilyInstance startInstance = null; doc.Invoke(ts => { - end_instance = doc.Create.NewFamilyInstance(final_point + l / 2 * normal_vertical_offest_vector, shelf_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + endInstance = doc.Create.NewFamilyInstance(finalPoint + l / 2 * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - start_instance = doc.Create.NewFamilyInstance(final_point - l / 2 * normal_vertical_offest_vector, shelf_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + startInstance = doc.Create.NewFamilyInstance(finalPoint - l / 2 * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - instances.Add(start_instance); + instances.Add(startInstance); - instances.Add(end_instance); + instances.Add(endInstance); }, "创建货架"); doc.Invoke(ts => { - if (parallel_referline_offest < 0.001) + if (parallelReferlineOffest < 0.001) { - if (j % 2 != 0 && start_instance.CanFlipHand && end_instance.CanFlipHand) + if (j % 2 != 0 && startInstance.CanFlipHand && endInstance.CanFlipHand) { - start_instance.flipHand(); - end_instance.flipHand(); + startInstance.flipHand(); + endInstance.flipHand(); } } else { - if (j % 2 == 0 && start_instance.CanFlipHand && end_instance.CanFlipHand) + if (j % 2 == 0 && startInstance.CanFlipHand && endInstance.CanFlipHand) { - start_instance.flipHand(); - end_instance.flipHand(); + startInstance.flipHand(); + endInstance.flipHand(); } } }, "翻转货架"); @@ -267,34 +267,34 @@ namespace RookieStation.PackAreaModule case NumOfGroup.Three: - for (int j = 0; j < first_row_points.Count; j++) + for (int j = 0; j < firstRowPoints.Count; j++) { - XYZ pt = first_row_points[j]; - XYZ offestdir = normal_vertical_offest_vector * (vertical_referline_offest + l * 3 / 2); + XYZ tempPoint = firstRowPoints[j]; + XYZ offestVector = normalVerticalOffestVector * (verticalReferlineOffest + l * 3 / 2); //垂直基准线平移 平行基准线平移 - final_point = pt + offestdir + refer_line.Direction * shelf_width / 2; + finalPoint = tempPoint + offestVector + referline.Direction * shelfWidth / 2; //附加通道和（单联、多联）货架长度的偏移 if (i > 0) { double totallength = GetTotalLength(shelves, i); - XYZ additionaldir = normal_vertical_offest_vector * (i * passage_width + totallength); - final_point += additionaldir; + XYZ additionaldir = normalVerticalOffestVector * (i * passageWidth + totallength); + finalPoint += additionaldir; } FamilyInstance end_instance = null; FamilyInstance center_instance = null; FamilyInstance start_instance = null; doc.Invoke(ts => { - center_instance = doc.Create.NewFamilyInstance(final_point, shelf_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - end_instance = doc.Create.NewFamilyInstance(final_point + l * normal_vertical_offest_vector, shelf_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); - start_instance = doc.Create.NewFamilyInstance(final_point - l * normal_vertical_offest_vector, shelf_symbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + center_instance = doc.Create.NewFamilyInstance(finalPoint, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + end_instance = doc.Create.NewFamilyInstance(finalPoint + l * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); + start_instance = doc.Create.NewFamilyInstance(finalPoint - l * normalVerticalOffestVector, shelfSymbol, level, Autodesk.Revit.DB.Structure.StructuralType.NonStructural); instances.Add(center_instance); instances.Add(end_instance); instances.Add(start_instance); }, "创建货架"); doc.Invoke(ts => { - if (parallel_referline_offest < 0.001) + if (parallelReferlineOffest < 0.001) { if (j % 2 != 0 && start_instance.CanFlipHand && center_instance.CanFlipHand && end_instance.CanFlipHand) { @@ -324,7 +324,7 @@ namespace RookieStation.PackAreaModule doc.Invoke(ts => { - XYZ veroffestdir = zaxis.CrossProduct(refer_line.Direction).Normalize(); + XYZ veroffestdir = zAxis.CrossProduct(referline.Direction).Normalize(); //旋转角度 double angle = XYZ.BasisY.AngleTo(veroffestdir); //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针） @@ -338,7 +338,7 @@ namespace RookieStation.PackAreaModule for (int j = 0; j < instances.Count; j++) { FamilyInstance instance = instances[j]; - var location_XYZ = RsRevitUtils.GetXYZByElement(instance); + var location_XYZ = RsRevitUtils.GetLocationPointByElement(instance); Line zline = Line.CreateUnbound(location_XYZ, XYZ.BasisZ); //旋转，移动 @@ -453,10 +453,10 @@ namespace RookieStation.PackAreaModule foreach (var ins in card_instances) { - var lp = RsRevitUtils.GetXYZByElement(ins); + var lp = RsRevitUtils.GetLocationPointByElement(ins); foreach (var card in card_instances) { - var lpt = RsRevitUtils.GetXYZByElement(card); + var lpt = RsRevitUtils.GetLocationPointByElement(card); if (!card.Id.Equals(ins.Id) && lp.IsAlmostEqualTo(lpt)) { ids_delete.Add(ins.Id); diff --git a/RookieStation/CmdPlaceWallFinishes.cs b/RookieStation/CmdPlaceWallFinishes.cs index 7bd4bcf..7287152 100644 --- a/RookieStation/CmdPlaceWallFinishes.cs +++ b/RookieStation/CmdPlaceWallFinishes.cs @@ -24,12 +24,6 @@ namespace RookieStation.Finishes Autodesk.Revit.ApplicationServices.Application app = uiapp.Application; Document doc = uidoc.Document; - var roomcounts = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Rooms).GetElementCount(); - if (roomcounts == 0) - { - TaskDialog.Show("温馨提示", "项目中当前没有房间"); - return Result.Cancelled; - } ElementCategoryFilter ecf = new ElementCategoryFilter(BuiltInCategory.OST_Walls); ElementCategoryFilter ecf1 = new ElementCategoryFilter(BuiltInCategory.OST_StackedWalls); LogicalOrFilter lof = new LogicalOrFilter(ecf, ecf1); @@ -63,99 +57,187 @@ namespace RookieStation.Finishes { return Result.Cancelled; } - WallType walltype = finishes.WallType; - bool iscontinue = true; + WallType wallType = finishes.WallType; + double wallWidth = wallType.Width; + double wallHeight = finishes.WallHeight; + double wallBaseOffest = finishes.WallBaseOffest; + string placeType = finishes.PlaceType; + bool isContinue = true; + try { - while (iscontinue) + while (isContinue) { - Reference refer = uidoc.Selection.PickObject(ObjectType.Element, new SelectFilter(), "请选择布置的房间"); + if (placeType == "房间") + { + var roomCount = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Rooms).GetElementCount(); + if (roomCount == 0) + { + TaskDialog.Show("温馨提示", "项目中当前没有房间"); + return Result.Failed; + } + Reference refer = uidoc.Selection.PickObject(ObjectType.Element, new SelectFilter(), "请选择布置的房间"); + Room room = uidoc.Document.GetElement(refer) as Room; + List curveLoopList = new List(); + List walltojoin = new List(); + List> wallToJoinList = new List>(); + var opts = new SpatialElementBoundaryOptions(); + //{ + // SpatialElementBoundaryLocation = SpatialElementBoundaryLocation.Finish + //}; + + //BuiltInCategory builtInCategory = (BuiltInCategory)walltype.Category.Id.IntegerValue; + //if (walltype.Kind == WallKind.Stacked) + //{ + // var li = walltype.GetSubelements(); + // walltype.get + //} + //if (walltype.Kind == WallKind.Basic) + //{ + // var compounds = walltype.GetCompoundStructure(); + // for (int i = 0; i < compounds.LayerCount; i++) + // { + // offest += compounds.GetWidth(); + // } + //} + + var segementsList = room.GetBoundarySegments(opts); + + if (segementsList != null) + { + foreach (var boundarySegments in segementsList) + { + CurveLoop curveLoop = new CurveLoop(); + foreach (var boundarySegment in boundarySegments) + { + curveLoop.Append(boundarySegment.GetCurve()); + walltojoin.Add(boundarySegment.ElementId); + } + wallToJoinList.Add(walltojoin); + curveLoopList.Add(curveLoop); + } + } + doc.Invoke(ts => + { + Plane plane = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); + //var mc = doc.Create.NewModelCurveArray(array, SketchPlane.Create(doc, plane)); + for (int i = 0; i < curveLoopList.Count; i++) + { + //切线方向叉乘参数中的向量，内侧叉乘-z + var offest_curveloop = CurveLoop.CreateViaOffset(curveLoopList[i], wallWidth / 2, -XYZ.BasisZ); + for (int j = 0; j < offest_curveloop.Count(); j++) + { + Curve curve = offest_curveloop.ElementAt(j); + ////c的方向叉乘参数中的向量，内侧叉乘-z + //var lc = c.CreateOffset(100 / 304.8, -XYZ.BasisZ); + + //var x = curve.ComputeDerivatives(0.5, true).BasisX.CrossProduct(-XYZ.BasisZ).Normalize() * 100 / 304.8; + //var mc = doc.Create.NewModelCurve(lc, SketchPlane.Create(doc, plane)); + //var mc = doc.Create.NewModelCurve(c, SketchPlane.Create(doc, plane)); + var wallCreated = Wall.Create(doc, curve, wallType.Id, doc.ActiveView.GenLevel.Id, wallHeight / 304.8, wallBaseOffest / 304.8, false, false); + wallCreated.get_Parameter(BuiltInParameter.WALL_ATTR_ROOM_BOUNDING).Set(0); + doc.Regenerate(); + //连接墙体让门窗可以剪切出来 + if (wallToJoinList[i][j].IntegerValue > 0) + { + Element elemToJoin = doc.GetElement(wallToJoinList[i][j]); + try + { + JoinGeometryUtils.JoinGeometry(doc, elemToJoin, wallCreated); + } + catch (Exception ex) + { + Log.WriteLog(ex.Message); + } + } + + //WallUtils.AllowWallJoinAtEnd(w, 0); + //offestcurves.Add(lc); + } + } + }, "创建房间饰面"); + } + else if (placeType == "墙面") + { + Reference referFace = uidoc.Selection.PickObject(ObjectType.Face, new SelectFilter(), "请选择布置的墙面"); + Wall wall = doc.GetElement(referFace) as Wall; + Face face = wall.GetGeometryObjectFromReference(referFace) as Face; + + var bottomFace = GetWallBottomFace(wall); + Curve instersectCurve = null; + face.Intersect(bottomFace, out instersectCurve); + doc.Invoke(ts => + { + Curve curve = instersectCurve.CreateOffset(wallWidth / 2, XYZ.BasisZ); + + var wallCreated = Wall.Create(doc, curve, wallType.Id, doc.ActiveView.GenLevel.Id, wallHeight / 304.8, wallBaseOffest / 304.8, false, false); + doc.Regenerate(); + try + { + JoinGeometryUtils.JoinGeometry(doc, wall, wallCreated); + } + catch (Exception ex) + { + Log.WriteLog(ex.Message); + } + }, "创建墙面饰面"); + //var loops = face.GetEdgesAsCurveLoops().OrderBy(x => x.GetExactLength()); + //// + //var cl = loops.LastOrDefault().GetEnumerator(); + ////face.Intersect(vp.SketchPlane.GetPlane()) + //while (cl.MoveNext()) + //{ + // var c = cl.Current; + //} + } + else if (placeType == "整墙") + { + Reference refer = uidoc.Selection.PickObject(ObjectType.Element, new SelectFilter(), "请选择布置的墙体"); + Wall wall = uidoc.Document.GetElement(refer) as Wall; + Face face = wall.GetGeometryObjectFromReference(refer) as Face; + + var bottomFace = GetWallBottomFace(wall); + var sideFaces = GetWallSideFaces(wall); + //CurveLoop loop = new CurveLoop(); + List curs = new List(); + Curve IntersectCurve = null; + foreach (var sideFace in sideFaces) + { + bottomFace.Intersect(sideFace, out IntersectCurve); + curs.Add(IntersectCurve); + //ModelCurve ml = doc.Create.NewModelCurve(cur, doc.ActiveView.SketchPlane); + + //loop.Append(cur); + } + //var loop = CurveLoop.Create(curs); + //var offestcurveloop = CurveLoop.CreateViaOffset(loop, wallwidth / 2, XYZ.BasisZ); + doc.Invoke(ts => + { + for (int i = 0; i < curs.Count(); i++) + { + Curve curve = curs.ElementAt(i).CreateOffset(wallWidth / 2, -XYZ.BasisZ); + var wallCreated = Wall.Create(doc, curve, wallType.Id, doc.ActiveView.GenLevel.Id, wallHeight / 304.8, wallBaseOffest / 304.8, false, false); + + doc.Regenerate(); + try + { + JoinGeometryUtils.JoinGeometry(doc, wall, wallCreated); + } + catch (Exception ex) + { + Log.WriteLog(ex.Message); + } + + //WallUtils.AllowWallJoinAtEnd(w, 0); + //offestcurves.Add(lc); + } + }, "创建墙体饰面"); + } //walltype包含了叠层墙和基本墙，属于不同族，如果出现名称一样，则会过滤出来两个 //var walltypes = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Walls).OfClass(typeof(WallType)).WhereElementIsElementType(); //var walls = new FilteredElementCollector(doc).OfClass(typeof(Wall)); //var walltype = walltypes.Where(x => x.Name == "常规 - 200mm").FirstOrDefault() as WallType; - - Room room = uidoc.Document.GetElement(refer) as Room; - List curveLoopList = new List(); - List walltojoin = new List(); - List> walltojoinlist = new List>(); - var opts = new SpatialElementBoundaryOptions(); - //{ - // SpatialElementBoundaryLocation = SpatialElementBoundaryLocation.Finish - //}; - double wallwidth = walltype.Width; - double wallheight = finishes.WallHeight; - //BuiltInCategory builtInCategory = (BuiltInCategory)walltype.Category.Id.IntegerValue; - //if (walltype.Kind == WallKind.Stacked) - //{ - // var li = walltype.GetSubelements(); - // walltype.get - //} - //if (walltype.Kind == WallKind.Basic) - //{ - // var compounds = walltype.GetCompoundStructure(); - // for (int i = 0; i < compounds.LayerCount; i++) - // { - // offest += compounds.GetWidth(); - // } - //} - - var segementsList = room.GetBoundarySegments(opts); - - if (segementsList != null) - { - foreach (var boundarySegments in segementsList) - { - CurveLoop curveLoop = new CurveLoop(); - foreach (var boundarySegment in boundarySegments) - { - curveLoop.Append(boundarySegment.GetCurve()); - walltojoin.Add(boundarySegment.ElementId); - } - walltojoinlist.Add(walltojoin); - curveLoopList.Add(curveLoop); - } - } - - doc.Invoke(ts => - { - Plane plane = Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()); - //var mc = doc.Create.NewModelCurveArray(array, SketchPlane.Create(doc, plane)); - for (int i = 0; i < curveLoopList.Count; i++) - { - //切线方向叉乘参数中的向量，内侧叉乘-z - var offestcurveloop = CurveLoop.CreateViaOffset(curveLoopList[i], wallwidth / 2, -XYZ.BasisZ); - for (int j = 0; j < offestcurveloop.Count(); j++) - { - Curve curve = offestcurveloop.ElementAt(j); - ////c的方向叉乘参数中的向量，内侧叉乘-z - //var lc = c.CreateOffset(100 / 304.8, -XYZ.BasisZ); - - //var x = curve.ComputeDerivatives(0.5, true).BasisX.CrossProduct(-XYZ.BasisZ).Normalize() * 100 / 304.8; - //var mc = doc.Create.NewModelCurve(lc, SketchPlane.Create(doc, plane)); - //var mc = doc.Create.NewModelCurve(c, SketchPlane.Create(doc, plane)); - var w = Wall.Create(doc, curve, walltype.Id, doc.ActiveView.GenLevel.Id, wallheight / 304.8, 0 / 304.8, false, false); - w.get_Parameter(BuiltInParameter.WALL_ATTR_ROOM_BOUNDING).Set(0); - doc.Regenerate(); - //让门窗可以剪切出来 - if (walltojoinlist[i][j].IntegerValue > 0) - { - Element elemtojoin = doc.GetElement(walltojoinlist[i][j]); - try - { - JoinGeometryUtils.JoinGeometry(doc, elemtojoin, w); - } - catch (Exception) - { - } - } - - //WallUtils.AllowWallJoinAtEnd(w, 0); - //offestcurves.Add(lc); - } - } - }, "创建墙饰面"); } } catch (Autodesk.Revit.Exceptions.OperationCanceledException) @@ -165,5 +247,77 @@ namespace RookieStation.Finishes return Result.Succeeded; } + + public List GetWallSideFaces(Wall wall) + { + Options opt = new Options(); + opt.ComputeReferences = true; + opt.DetailLevel = ViewDetailLevel.Fine; + GeometryElement ge = wall.get_Geometry(opt); + List lstpf = new List(); + foreach (GeometryObject obj in ge) + { + Solid solid = obj as Solid; + if (solid != null) + { + foreach (Face face in solid.Faces) + { + PlanarFace pf = face as PlanarFace; + if (pf != null) + { + if (pf.FaceNormal.DotProduct(XYZ.BasisZ) == 0) + { + lstpf.Add(pf); + } + //if (pf.FaceNormal.CrossProduct(wall.Orientation).IsZeroLength()) + //{ + // lstpf.Add(pf); + //} + } + var cy = face as CylindricalFace; + if (cy != null) + { + lstpf.Add(cy); + } + } + return lstpf; + } + } + return null; + } + + public PlanarFace GetWallBottomFace(Wall wall) + { + Options opt = new Options(); + opt.ComputeReferences = true; + opt.DetailLevel = ViewDetailLevel.Fine; + GeometryElement ge = wall.get_Geometry(opt); + PlanarFace pf = null; + foreach (GeometryObject obj in ge) + { + Solid solid = obj as Solid; + if (solid != null) + { + foreach (Face face in solid.Faces) + { + PlanarFace temppf = face as PlanarFace; + if (temppf != null) + { + if (temppf.FaceNormal.IsAlmostEqualTo(-XYZ.BasisZ)) + { + pf = temppf; + break; + } + //if (pf.FaceNormal.CrossProduct(wall.Orientation).IsZeroLength()) + //{ + // lstpf.Add(pf); + //} + } + } + return pf; + } + } + return null; + } } } \ No newline at end of file diff --git a/RookieStation/Custom/Enum.cs b/RookieStation/Custom/Enum.cs index 7f4dd98..3570979 100644 --- a/RookieStation/Custom/Enum.cs +++ b/RookieStation/Custom/Enum.cs @@ -19,7 +19,7 @@ namespace RookieStation Three = 3, } - public enum LengthType + public enum ShelfLength { [Description("1000")] x1000 = 1, @@ -34,7 +34,7 @@ namespace RookieStation x2000 = 4, } - public enum WidthType + public enum ShelfWidth { [Description("400")] x400 = 1, diff --git a/RookieStation/Custom/Shelf.cs b/RookieStation/Custom/Shelf.cs index 4130ab7..9d40f6a 100644 --- a/RookieStation/Custom/Shelf.cs +++ b/RookieStation/Custom/Shelf.cs @@ -10,9 +10,9 @@ namespace RookieStation public class Shelf { //public bool IsSelected { get; set; } - public LengthType LengthType { get; set; } + public ShelfLength ShelfLength { get; set; } - public WidthType WidthType { get; set; } + public ShelfWidth ShelfWidth { get; set; } public NumOfGroup NumOfGroup { get; set; } //public int StartNumber { get; set; } //public int EndNumber { get; set; } @@ -21,7 +21,7 @@ namespace RookieStation { get { - string strlength = CommonUtils.GetEnumDescription(LengthType); + string strlength = CommonUtils.GetEnumDescription(ShelfLength); return Convert.ToDouble(strlength); } } @@ -30,11 +30,11 @@ namespace RookieStation { get { - string strwidth = CommonUtils.GetEnumDescription(WidthType); + string strwidth = CommonUtils.GetEnumDescription(ShelfWidth); return Convert.ToDouble(strwidth); } } - public string SymbolName => String.Format("{0}{1}{2}{3}", CommonUtils.GetEnumDescription(LengthType), "mmx", CommonUtils.GetEnumDescription(WidthType), "mm"); + public string SymbolName => String.Format("{0}{1}{2}{3}", CommonUtils.GetEnumDescription(ShelfLength), "mmx", CommonUtils.GetEnumDescription(ShelfWidth), "mm"); } } \ No newline at end of file diff --git a/RookieStation/RookieStation.csproj b/RookieStation/RookieStation.csproj index 1f4a383..87b79b6 100644 --- a/RookieStation/RookieStation.csproj +++ b/RookieStation/RookieStation.csproj @@ -92,7 +92,6 @@ - True True diff --git a/RookieStation/RsApp.cs b/RookieStation/RsApp.cs index b0ba1ae..8893467 100644 --- a/RookieStation/RsApp.cs +++ b/RookieStation/RsApp.cs @@ -55,7 +55,7 @@ namespace RookieStation LargeImage = ConvertFromBitmap(Properties.Resources.cainiao), Image = ConvertFromBitmap(Properties.Resources.cainiao) }; - var projectbtn = (PushButton)projectPanel.AddItem(projectPBD); + var projectBtn = (PushButton)projectPanel.AddItem(projectPBD); //前台布置 RibbonPanel receptionAreaPanel = application.CreateRibbonPanel(TabName, ReceptionPanelName); PushButtonData receptionLayoutPBD = new PushButtonData("寄件区布置", "前台布置", AddInPath, "RookieStation.ShippingAreaModule.CmdPlaceReceptionArea") @@ -63,8 +63,8 @@ namespace RookieStation LargeImage = ConvertFromBitmap(Properties.Resources.Reception), Image = ConvertFromBitmap(Properties.Resources.Reception) }; - var receptionbtn = (PushButton)receptionAreaPanel.AddItem(receptionLayoutPBD); - receptionbtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + var receptionBtn = (PushButton)receptionAreaPanel.AddItem(receptionLayoutPBD); + receptionBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; //出入口布置 RibbonPanel packAreaPanel = application.CreateRibbonPanel(TabName, EntranceAndExitGatePanelName); PushButtonData entrancegateLayoutPBD = new PushButtonData("入口布置", "入口闸机", AddInPath, "RookieStation.PackAreaModule.CmdPlaceEntranceGate") @@ -77,38 +77,38 @@ namespace RookieStation LargeImage = ConvertFromBitmap(Properties.Resources.ExitGate), Image = ConvertFromBitmap(Properties.Resources.ExitGate) }; - //var gatebtn = (PushButton)gatePanel.AddItem(exportGateLayoutPBD); + //var gateBtn = (PushButton)gatePanel.AddItem(exportGateLayoutPBD); //IList gateItemsStacked = packAreaPanel.AddStackedItems(entrancegateLayoutPBD, exitGateLayoutPBD); - //var entrancebtn = (PushButton)gateItemsStacked[0]; - //var exitbtn = (PushButton)gateItemsStacked[1]; - var entrancebtn = (PushButton)packAreaPanel.AddItem(entrancegateLayoutPBD); - var exitbtn = (PushButton)packAreaPanel.AddItem(exitGateLayoutPBD); - entrancebtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; - exitbtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + //var entranceBtn = (PushButton)gateItemsStacked[0]; + //var exitBtn = (PushButton)gateItemsStacked[1]; + var entranceBtn = (PushButton)packAreaPanel.AddItem(entrancegateLayoutPBD); + var exitBtn = (PushButton)packAreaPanel.AddItem(exitGateLayoutPBD); + entranceBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + exitBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; PushButtonData placeShelvesPBD = new PushButtonData("货架布置", "货架布置", AddInPath, "RookieStation.PackAreaModule.CmdPlaceShelves") { LargeImage = ConvertFromBitmap(Properties.Resources.Shelf), Image = ConvertFromBitmap(Properties.Resources.Shelf) }; - var placeShelvesbtn = (PushButton)packAreaPanel.AddItem(placeShelvesPBD); - placeShelvesbtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + var placeShelvesBtn = (PushButton)packAreaPanel.AddItem(placeShelvesPBD); + placeShelvesBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; PushButtonData placeShelveCardsPBD = new PushButtonData("货架端牌", "货架端牌", AddInPath, "RookieStation.PackAreaModule.CmdArrangeShelfCards") { LargeImage = ConvertFromBitmap(Properties.Resources.ShelfCard), Image = ConvertFromBitmap(Properties.Resources.ShelfCard) }; - var placeShelveCardsbtn = (PushButton)packAreaPanel.AddItem(placeShelveCardsPBD); + var placeShelveCardsBtn = (PushButton)packAreaPanel.AddItem(placeShelveCardsPBD); PushButtonData placeLampsPBD = new PushButtonData("灯具布置", "灯具布置", AddInPath, "RookieStation.PackAreaModule.CmdPlaceLamps") { LargeImage = ConvertFromBitmap(Properties.Resources.Lamp), Image = ConvertFromBitmap(Properties.Resources.Lamp) }; - var placeLampsbtn = (PushButton)packAreaPanel.AddItem(placeLampsPBD); - placeLampsbtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + var placeLampsBtn = (PushButton)packAreaPanel.AddItem(placeLampsPBD); + placeLampsBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; //饰面，完成面 RibbonPanel finishesPanel = application.CreateRibbonPanel(TabName, FinishesPanelName); @@ -117,16 +117,17 @@ namespace RookieStation LargeImage = ConvertFromBitmap(Properties.Resources.FloorFinishes), Image = ConvertFromBitmap(Properties.Resources.FloorFinishes) }; - var floorcoveringbtn = (PushButton)finishesPanel.AddItem(floorfinishesPBD); - floorcoveringbtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + var floorcoveringBtn = (PushButton)finishesPanel.AddItem(floorfinishesPBD); + floorcoveringBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; PushButtonData wallcoveringPBD = new PushButtonData("墙饰面", "墙饰面", AddInPath, "RookieStation.Finishes.CmdPlaceWallFinishes") { LargeImage = ConvertFromBitmap(Properties.Resources.WallFinishes), Image = ConvertFromBitmap(Properties.Resources.WallFinishes) }; - var wallcoveringbtn = (PushButton)finishesPanel.AddItem(wallcoveringPBD); - wallcoveringbtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; + + var wallcoveringBtn = (PushButton)finishesPanel.AddItem(wallcoveringPBD); + wallcoveringBtn.AvailabilityClassName = "RookieStation.ViewPlanCmdEnabled"; //统计面板 RibbonPanel statisticsPanel = application.CreateRibbonPanel(TabName, StatisticsPanelName); diff --git a/RookieStation/RsLibrary/Document/样板工程量清单.xlsx b/RookieStation/RsLibrary/Document/样板工程量清单.xlsx index be0f38e10f00c7fbe0fdfe5e5dcdfafb493764ff..2c854e7ba21a6d4cd77c6495ef012657085923bb 100644 GIT binary patch delta 21767 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 /// 基于参考线的偏移（垂距） /// - public double VerticalReferOffest { get; set; } + public double VerticalReferlineOffest { get; set; } /// /// 通道宽度 @@ -23,12 +23,12 @@ namespace RookieStation /// /// 基于参考线的偏移(起点水平) /// - public double ParalelReferOffest { get; set; } + public double ParallelReferlineOffest { get; set; } /// /// 货架间距 /// - public double Spacing { get; set; } + public double ShelfSpacing { get; set; } public ShelvesPlacementViewModel() { @@ -44,32 +44,32 @@ namespace RookieStation for (int i = 0; i < sc.Count; i++) { Shelf shelf = new Shelf(); - string shelf_string = sc[i]; - string[] shelf_chars = shelf_string.Split(','); - foreach (NumOfGroup ng in Enum.GetValues(typeof(NumOfGroup))) + string shelfInfo = sc[i]; + string[] shelfChars = shelfInfo.Split(','); + foreach (NumOfGroup numDescription in Enum.GetValues(typeof(NumOfGroup))) { - string description = CommonUtils.GetEnumDescription(ng); - if (description == shelf_chars[0]) + string description = CommonUtils.GetEnumDescription(numDescription); + if (description == shelfChars[0]) { - shelf.NumOfGroup = ng; + shelf.NumOfGroup = numDescription; break; } } - foreach (LengthType lt in Enum.GetValues(typeof(LengthType))) + foreach (ShelfLength lengthDescription in Enum.GetValues(typeof(ShelfLength))) { - string description = CommonUtils.GetEnumDescription(lt); - if (description == shelf_chars[1]) + string description = CommonUtils.GetEnumDescription(lengthDescription); + if (description == shelfChars[1]) { - shelf.LengthType = lt; + shelf.ShelfLength = lengthDescription; break; } } - foreach (WidthType wt in Enum.GetValues(typeof(WidthType))) + foreach (ShelfWidth widthDescription in Enum.GetValues(typeof(ShelfWidth))) { - string description = CommonUtils.GetEnumDescription(wt); - if (description == shelf_chars[2]) + string description = CommonUtils.GetEnumDescription(widthDescription); + if (description == shelfChars[2]) { - shelf.WidthType = wt; + shelf.ShelfWidth = widthDescription; break; } } diff --git a/RookieStation/TestCmd.cs b/RookieStation/TestCmd.cs deleted file mode 100644 index cb89276..0000000 --- a/RookieStation/TestCmd.cs +++ /dev/null @@ -1,52 +0,0 @@ -using Autodesk.Revit.DB; -using Autodesk.Revit.UI; -using Autodesk.Revit.UI.Selection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RookieStation -{ - [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] - [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] - internal class TestCmd : IExternalCommand - { - public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements) - { - UIApplication uiapp = commandData.Application; - UIDocument uidoc = uiapp.ActiveUIDocument; - Autodesk.Revit.ApplicationServices.Application app = uiapp.Application; - Document doc = uidoc.Document; - DocumentSet docset = uiapp.Application.Documents; - ICollection sys = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_FurnitureSystems).OfClass(typeof(FamilyInstance)).ToElements(); - foreach (FamilyInstance sy in sys) - { - if (sy.Symbol.FamilyName.Contains("亚克力")) - { - TaskDialog.Show("提示", "存在"); - } - } - using (Transaction trans = new Transaction(doc, "cmd")) - { - try - { - trans.Start(); - //Do Something. - trans.Commit(); - } - catch (Exception ex) - { - message = ex.Message; - if (trans.GetStatus() == TransactionStatus.Started) - { - trans.RollBack(); - } - return Result.Cancelled; - } - } - return Result.Succeeded; - } - } -} \ No newline at end of file diff --git a/RookieStation/Utils/DocumentExtension.cs b/RookieStation/Utils/DocumentExtension.cs index 200a7f4..be9a883 100644 --- a/RookieStation/Utils/DocumentExtension.cs +++ b/RookieStation/Utils/DocumentExtension.cs @@ -178,9 +178,9 @@ namespace RookieStation.Utils { tg.Start(); - var result = func(tg); + TResult result = func(tg); - var status = tg.GetStatus(); + TransactionStatus status = tg.GetStatus(); switch (status) { case TransactionStatus.Started: diff --git a/RookieStation/Utils/RsRevitUtils.cs b/RookieStation/Utils/RsRevitUtils.cs index 712a28e..a1e47ff 100644 --- a/RookieStation/Utils/RsRevitUtils.cs +++ b/RookieStation/Utils/RsRevitUtils.cs @@ -14,31 +14,31 @@ namespace RookieStation.Utils /// /// 英尺转米 /// - /// + /// /// - public static double FtConvertToM(double valuetoconvert) + public static double FtConvertToM(double valueToConvert) { - return UnitUtils.ConvertFromInternalUnits(valuetoconvert, DisplayUnitType.DUT_METERS); + return UnitUtils.ConvertFromInternalUnits(valueToConvert, DisplayUnitType.DUT_METERS); } /// /// 平方英尺转平方米 /// - /// + /// /// - public static double SFConvertToSM(double valuetoconvert) + public static double SFConvertToSM(double valueToConvert) { - return UnitUtils.ConvertFromInternalUnits(valuetoconvert, DisplayUnitType.DUT_SQUARE_METERS); + return UnitUtils.ConvertFromInternalUnits(valueToConvert, DisplayUnitType.DUT_SQUARE_METERS); } /// /// 英尺转换成毫米单位 /// - /// + /// /// - public static double FtConvertToMM(double valuetoconvert) + public static double FtConvertToMM(double valueToConvert) { - return UnitUtils.ConvertFromInternalUnits(valuetoconvert, DisplayUnitType.DUT_MILLIMETERS); + return UnitUtils.ConvertFromInternalUnits(valueToConvert, DisplayUnitType.DUT_MILLIMETERS); } /// @@ -46,14 +46,14 @@ namespace RookieStation.Utils /// /// 墙类型包含的字符串 /// - public static double GetWallWidthByWallTypeName(Document doc, string wallTypeName, out WallType walltype) + public static double GetWallWidthByWallTypeName(Document doc, string wallTypeName, out WallType wallType) { double thickness = 0.0; var walltypelist = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Walls).OfClass(typeof(WallType)).Cast(); - walltype = walltypelist.FirstOrDefault(t => t.Name.Contains(wallTypeName)); - if (walltype != null) + wallType = walltypelist.FirstOrDefault(t => t.Name.Contains(wallTypeName)); + if (wallType != null) { - thickness = walltype.Width; + thickness = wallType.Width; //var compounds = walltype.GetCompoundStructure(); //for (int i = 0; i < compounds.LayerCount; i++) //{ @@ -68,7 +68,7 @@ namespace RookieStation.Utils /// /// /// - public static XYZ GetXYZByElement(Element instance) + public static XYZ GetLocationPointByElement(Element instance) { return instance.Location is LocationPoint lp ? lp.Point : null; } @@ -77,19 +77,19 @@ namespace RookieStation.Utils /// 调整族实例位置 /// /// - /// 需要偏移的族实例 - /// 用于调整偏移和角度的参考线 + /// 需要偏移的族实例 + /// 用于调整偏移和角度的参考线 /// 偏移量 - public static void AdjustInstances(Document doc, List fis, Line refer_line, double offest) + public static void AdjustInstances(Document doc, List instances, Line referLine, double offest) { - var zdir = XYZ.BasisZ; + XYZ zdir = XYZ.BasisZ; //通过第三点垂直于直线的单位向量（无论左右侧）*偏移距离（一半的闸机长度） - XYZ offestdir = zdir.CrossProduct(refer_line.Direction).Normalize() * offest; + XYZ offestVector = zdir.CrossProduct(referLine.Direction).Normalize() * offest; //旋转角度 - double angle = XYZ.BasisY.AngleTo(offestdir); + double angle = XYZ.BasisY.AngleTo(offestVector); //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针） - XYZ z = offestdir.CrossProduct(XYZ.BasisY).Normalize(); + XYZ z = offestVector.CrossProduct(XYZ.BasisY).Normalize(); if (z.IsAlmostEqualTo(XYZ.BasisZ)) { //逆向旋转，角度取负值 @@ -97,13 +97,13 @@ namespace RookieStation.Utils //var ml = doc.Create.NewModelCurve(Line.CreateBound(XYZ.Zero, re), SketchPlane.Create(doc, Plane.CreateByNormalAndOrigin(XYZ.BasisZ, new XYZ()))); } - foreach (var fi in fis) + foreach (FamilyInstance instance in instances) { - var p = GetXYZByElement(fi); + XYZ p = GetLocationPointByElement(instance); Line l = Line.CreateUnbound(p, XYZ.BasisZ); //旋转，移动 - ElementTransformUtils.RotateElement(doc, fi.Id, l, angle); - ElementTransformUtils.MoveElement(doc, fi.Id, offestdir); + ElementTransformUtils.RotateElement(doc, instance.Id, l, angle); + ElementTransformUtils.MoveElement(doc, instance.Id, offestVector); } } @@ -112,30 +112,30 @@ namespace RookieStation.Utils /// /// /// - /// + /// /// - public static void AdjustInstance(Document doc, FamilyInstance fi, Line refer_line, double offest) + public static void AdjustInstance(Document doc, FamilyInstance fi, Line referLine, double offest) { //朝着向量方向左侧偏移 - var zdir = XYZ.BasisZ; + XYZ zdir = XYZ.BasisZ; //通过第三点垂直于直线的单位向量（无论左右侧）*偏移距离（一半的闸机长度） - XYZ offest_direction = zdir.CrossProduct(refer_line.Direction).Normalize() * offest; + XYZ offestVector = zdir.CrossProduct(referLine.Direction).Normalize() * offest; //旋转角度 - double angle = XYZ.BasisY.AngleTo(offest_direction); + double angle = XYZ.BasisY.AngleTo(offestVector); //判断相对于Y轴是正向角度（逆时针）还是逆向角度（顺时针） - XYZ z = offest_direction.CrossProduct(XYZ.BasisY).Normalize(); + XYZ z = offestVector.CrossProduct(XYZ.BasisY).Normalize(); if (z.IsAlmostEqualTo(XYZ.BasisZ)) { //逆向旋转，角度取负值 angle = -angle; } - var p = GetXYZByElement(fi); + XYZ p = GetLocationPointByElement(fi); Line l = Line.CreateUnbound(p, XYZ.BasisZ); //旋转，移动 ElementTransformUtils.RotateElement(doc, fi.Id, l, angle + Math.PI); - ElementTransformUtils.MoveElement(doc, fi.Id, offest_direction); + ElementTransformUtils.MoveElement(doc, fi.Id, offestVector); } /// @@ -144,14 +144,14 @@ namespace RookieStation.Utils public static void AddProjectTemplate() { //Autodesk.Revit.ApplicationServices.Application.CurrentUsersDataFolderPath - string oriDatei = @"" + Environment.GetEnvironmentVariable("appdata") + @"\Autodesk\Revit\Autodesk Revit 2020\Revit.ini"; - string tmpDatei = UserConstant.FamilyLibraryDirectory + "\\Rs.ini"; + string oriDateFilePath = @"" + Environment.GetEnvironmentVariable("appdata") + @"\Autodesk\Revit\Autodesk Revit 2020\Revit.ini"; + string tmpDateFilePath = UserConstant.FamilyLibraryDirectory + "\\Rs.ini"; - if (System.IO.File.Exists(oriDatei)) + if (System.IO.File.Exists(oriDateFilePath)) { - using (StreamReader sr = new StreamReader(oriDatei, Encoding.Unicode)) + using (StreamReader sr = new StreamReader(oriDateFilePath, Encoding.Unicode)) { - StreamWriter sw = new StreamWriter(tmpDatei, false, Encoding.Unicode); + StreamWriter sw = new StreamWriter(tmpDateFilePath, false, Encoding.Unicode); string inputLine = ""; while ((inputLine = sr.ReadLine()) != null) @@ -172,34 +172,34 @@ namespace RookieStation.Utils sw.Close(); } - System.IO.File.Replace(tmpDatei, oriDatei, null); + System.IO.File.Replace(tmpDateFilePath, oriDateFilePath, null); } } public static FamilySymbol GetGuideSymbol(Document doc) { - FamilySymbol linesymbol = null; + FamilySymbol lineSymbol = null; doc.Invoke(ts => { - Family linefamily = GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "定位线.rfa"); - linesymbol = doc.GetElement(linefamily.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol; + Family lineFamily = GetLoadedFamily(doc, UserConstant.FamilyLibraryDirectory + "定位线.rfa"); + lineSymbol = doc.GetElement(lineFamily.GetFamilySymbolIds().FirstOrDefault()) as FamilySymbol; }, "载入定位线并布置"); - return linesymbol; + return lineSymbol; } public static Line GetGuideGeometryAndDeleteGuide(Document doc, List eleIdsAdded) { - ElementId referlineid = eleIdsAdded.FirstOrDefault(); - FamilyInstance referline = doc.GetElement(referlineid) as FamilyInstance; - LocationCurve lc = referline.Location as LocationCurve; - Line referlinegeom = lc.Curve as Line; + ElementId referLineId = eleIdsAdded.FirstOrDefault(); + FamilyInstance guideLine = doc.GetElement(referLineId) as FamilyInstance; + LocationCurve lc = guideLine.Location as LocationCurve; + Line line = lc.Curve as Line; doc.Invoke(ts => { - doc.Delete(referlineid); + doc.Delete(referLineId); }, "删除参考线"); - return referlinegeom; + return line; } /// @@ -210,7 +210,7 @@ namespace RookieStation.Utils /// 所有的面 public static List GetFaceByElement(Element item, Options options) { - List listFace = new List(); + List faces = new List(); //根据打开的方式得到几何信息 GeometryElement geometry = item.get_Geometry(options); foreach (GeometryObject geomObj in geometry) @@ -223,14 +223,14 @@ namespace RookieStation.Utils foreach (GeometryObject instObj in geomInstance.GetInstanceGeometry()) { //三维的实体 - Solid instsolid = instObj as Solid; - if (instsolid == null || instsolid.Faces.Size == 0 || instsolid.Edges.Size == 0) + Solid instSolid = instObj as Solid; + if (instSolid == null || instSolid.Faces.Size == 0 || instSolid.Edges.Size == 0) { continue; } - foreach (Face face in instsolid.Faces) + foreach (Face face in instSolid.Faces) { - listFace.Add(face); + faces.Add(face); } } } @@ -246,12 +246,12 @@ namespace RookieStation.Utils { foreach (Face face in solid.Faces) { - listFace.Add(face); + faces.Add(face); } } } } - return listFace; + return faces; } /// @@ -261,7 +261,7 @@ namespace RookieStation.Utils /// public static List GetFacesByFamilyInstance(FamilyInstance instance, Options options) { - List listFace = new List(); + List faces = new List(); //根据打开的方式得到几何信息 GeometryElement geometry = instance.get_Geometry(options); foreach (GeometryObject geomObj in geometry) @@ -280,14 +280,14 @@ namespace RookieStation.Utils foreach (GeometryObject instObj in instanceGeometry) { //三维的实体 - Solid instsolid = instObj as Solid; - if (instsolid == null || instsolid.Faces.Size == 0 || instsolid.Edges.Size == 0) + Solid instSolid = instObj as Solid; + if (instSolid == null || instSolid.Faces.Size == 0 || instSolid.Edges.Size == 0) { continue; } - foreach (Face face in instsolid.Faces) + foreach (Face face in instSolid.Faces) { - listFace.Add(face); + faces.Add(face); } } } @@ -303,12 +303,12 @@ namespace RookieStation.Utils { foreach (Face face in solid.Faces) { - listFace.Add(face); + faces.Add(face); } } } } - return listFace; + return faces; } /// @@ -318,7 +318,7 @@ namespace RookieStation.Utils /// public static List GetFamilyInstanceFaces(FamilyInstance instance, Options options) { - List listFace = new List(); + List faces = new List(); //根据打开的方式得到几何信息 GeometryElement geometry = instance.get_Geometry(options); @@ -334,14 +334,14 @@ namespace RookieStation.Utils foreach (GeometryObject instObj in geomInstance.GetInstanceGeometry()) { //三维的实体 - Solid instsolid = instObj as Solid; - if (instsolid == null || instsolid.Faces.Size == 0 || instsolid.Edges.Size == 0) + Solid instSolid = instObj as Solid; + if (instSolid == null || instSolid.Faces.Size == 0 || instSolid.Edges.Size == 0) { continue; } - foreach (Face face in instsolid.Faces) + foreach (Face face in instSolid.Faces) { - listFace.Add(face); + faces.Add(face); } } } @@ -357,12 +357,12 @@ namespace RookieStation.Utils { foreach (Face face in solid.Faces) { - listFace.Add(face); + faces.Add(face); } } } } - return listFace; + return faces; } /// @@ -399,20 +399,20 @@ namespace RookieStation.Utils /// 获取已载入同名族,若无，则载入 /// /// - /// + /// /// - internal static Family GetLoadedFamily(Document doc, string familyname) + internal static Family GetLoadedFamily(Document doc, string familyName) { Family family; family = new FilteredElementCollector(doc) .OfClass(typeof(Family)) .Cast() - .Where(f => f.Name == Path.GetFileNameWithoutExtension(familyname)) + .Where(f => f.Name == Path.GetFileNameWithoutExtension(familyName)) .FirstOrDefault(); if (family == null) { - doc.LoadFamily(familyname, new RsFamilyLoadOption(), out family); + doc.LoadFamily(familyName, new RsFamilyLoadOption(), out family); } return family; @@ -422,23 +422,23 @@ namespace RookieStation.Utils /// 获取垂直于基准线的最长边 /// /// - /// + /// /// - public static Line GetLongestSegmentLine(IList segments, Line baseline) + public static Line GetLongestSegmentLine(IList segments, Line baseLine) { Line line = null; //var m = doc.GetElement(refer.ElementId); foreach (var seg in segments) { - Line templine = seg.GetCurve() as Line; + Line tempLine = seg.GetCurve() as Line; //判断是否垂直 - double dotp = Math.Abs(templine.Direction.DotProduct(baseline.Direction)); + double dotp = Math.Abs(tempLine.Direction.DotProduct(baseLine.Direction)); if (dotp < 0.0001) { - if (line == null || line.Length < templine.Length) + if (line == null || line.Length < tempLine.Length) { - line = templine; + line = tempLine; } } } diff --git a/RookieStation/Utils/ViewPlanCmdEnabled.cs b/RookieStation/Utils/ViewPlanCmdEnabled.cs index 6756095..b1461f5 100644 --- a/RookieStation/Utils/ViewPlanCmdEnabled.cs +++ b/RookieStation/Utils/ViewPlanCmdEnabled.cs @@ -15,6 +15,19 @@ namespace RookieStation { public bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories) { + //Application revitApplication = applicationData.Application; + //ApplicationOptions options = ApplicationOptions.Get(); + + //switch (options.Availability) + //{ + // case ApplicationAvailablity.ArchitectureDiscipline: + // return revitApplication.IsArchitectureEnabled; + // case ApplicationAvailablity.StructuralAnalysis: + // return revitApplication.IsStructuralAnalysisEnabled; + // case ApplicationAvailablity.MEP: + // return revitApplication.IsSystemsEnabled; + //} + if (null != applicationData.ActiveUIDocument) { Autodesk.Revit.DB.View view = applicationData.ActiveUIDocument.Document.ActiveView; diff --git a/RookieStation/WpfEntranceGate.xaml b/RookieStation/WpfEntranceGate.xaml index 44f5b81..e341021 100644 --- a/RookieStation/WpfEntranceGate.xaml +++ b/RookieStation/WpfEntranceGate.xaml @@ -30,7 +30,7 @@ Margin="2" Header="通道宽度(mm)"> diff --git a/RookieStation/WpfEntranceGate.xaml.cs b/RookieStation/WpfEntranceGate.xaml.cs index c629bfb..ec86e2b 100644 --- a/RookieStation/WpfEntranceGate.xaml.cs +++ b/RookieStation/WpfEntranceGate.xaml.cs @@ -20,7 +20,7 @@ namespace RookieStation /// public partial class WpfEntranceGate { - public double passage_width = 0.0; + public double PassageWidth { get; set; } public WpfEntranceGate() { @@ -29,10 +29,11 @@ namespace RookieStation private void btnConfirm_Click(object sender, RoutedEventArgs e) { - bool a = double.TryParse(tbpassage_width.Text, out passage_width); - + double passageWidth; + bool a = double.TryParse(tbPassage_width.Text, out passageWidth); if (a) { + PassageWidth = passageWidth; DialogResult = true; } } diff --git a/RookieStation/WpfExitGate.xaml b/RookieStation/WpfExitGate.xaml index 9c85e8a..3d5eb44 100644 --- a/RookieStation/WpfExitGate.xaml +++ b/RookieStation/WpfExitGate.xaml @@ -55,7 +55,7 @@ Margin="2" Header="通道宽度(mm)"> diff --git a/RookieStation/WpfExitGate.xaml.cs b/RookieStation/WpfExitGate.xaml.cs index faf1525..6eab67b 100644 --- a/RookieStation/WpfExitGate.xaml.cs +++ b/RookieStation/WpfExitGate.xaml.cs @@ -20,9 +20,9 @@ namespace RookieStation /// public partial class WpfExitGate { - public bool isStartPassage = true; + public bool IsStartPassage { get; set; } - public double passage_width = 0.0; + public double PassageWidth { get; set; } public WpfExitGate() @@ -32,15 +32,17 @@ namespace RookieStation private void btnConfirm_Click(object sender, RoutedEventArgs e) { - bool a = double.TryParse(tbpassage_width.Text, out passage_width); + double passageWidth; + bool a = double.TryParse(tbPassagewidth.Text, out passageWidth); if (rbStartPassage.IsChecked == true) { - isStartPassage = true; + PassageWidth = passageWidth; + IsStartPassage = true; } else if (rbStartInspection.IsChecked == true) { - isStartPassage = false; + IsStartPassage = false; } if (a) { diff --git a/RookieStation/WpfFloorFinishes.xaml b/RookieStation/WpfFloorFinishes.xaml index e9a025f..e09f761 100644 --- a/RookieStation/WpfFloorFinishes.xaml +++ b/RookieStation/WpfFloorFinishes.xaml @@ -35,7 +35,7 @@ Margin="2" Header="砖长（mm）"> public partial class WpfFloorFinishes { - public double cLength; + public double PavementLength { get; set; } - public double cWidth; + public double PavementWidth { get; set; } - public double cGap; + public double PavementGap { get; set; } public WpfFloorFinishes() @@ -34,11 +34,15 @@ namespace RookieStation private void btnConfirm_Click(object sender, RoutedEventArgs e) { - var a = double.TryParse(tbLength.Text, out cLength); - var b = double.TryParse(tbWidth.Text, out cWidth); - var c = double.TryParse(tbGap.Text, out cGap); + double length, width, gap; + var a = double.TryParse(tbPavementLength.Text, out length); + var b = double.TryParse(tbPavementWidth.Text, out width); + var c = double.TryParse(tbPavementGap.Text, out gap); if (a && b && c) { + PavementLength = length; + PavementWidth = width; + PavementGap = gap; DialogResult = true; } else diff --git a/RookieStation/WpfLampsLayout.xaml.cs b/RookieStation/WpfLampsLayout.xaml.cs index 6eeee60..e0af2a5 100644 --- a/RookieStation/WpfLampsLayout.xaml.cs +++ b/RookieStation/WpfLampsLayout.xaml.cs @@ -20,8 +20,8 @@ namespace RookieStation /// public partial class WpfLampsLayout { - public double LRDistance; - public double FBDistance; + public double LeftRightDistance { get; set; } + public double FrontDistance { get; set; } public WpfLampsLayout() { @@ -30,10 +30,13 @@ namespace RookieStation private void btnConfirm_Click(object sender, RoutedEventArgs e) { - bool a = double.TryParse(tbDistanceLR.Text, out LRDistance); - bool b = double.TryParse(tbDistanceFB.Text, out FBDistance); + double lrDistance, fDistance; + bool a = double.TryParse(tbDistanceLR.Text, out lrDistance); + bool b = double.TryParse(tbDistanceFB.Text, out fDistance); if (a && b) { + LeftRightDistance = lrDistance; + FrontDistance = fDistance; DialogResult = true; } } diff --git a/RookieStation/WpfReceptionArea.xaml b/RookieStation/WpfReceptionArea.xaml index 4d1a15d..75a1209 100644 --- a/RookieStation/WpfReceptionArea.xaml +++ b/RookieStation/WpfReceptionArea.xaml @@ -3,12 +3,13 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:local="clr-namespace:RookieStation" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="485" - Height="220" - MinWidth="550" - MinHeight="250" + Width="126" + Height="338" + MinWidth="220" + MinHeight="480" mc:Ignorable="d"> @@ -20,68 +21,66 @@ - + + + - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + +