diff --git a/RookieStation/Construction/ExecuteCmd/AutoGenerateModels.cs b/RookieStation/Construction/ExecuteCmd/AutoGenerateModels.cs index 574df8e..40e3656 100644 --- a/RookieStation/Construction/ExecuteCmd/AutoGenerateModels.cs +++ b/RookieStation/Construction/ExecuteCmd/AutoGenerateModels.cs @@ -76,6 +76,7 @@ namespace RookieStation.Construction.ExecuteCmd { //边界组 CreateFloor(doc, edges); + CreateFloor(doc, edges); }, "创建楼板"); doc.Invoke(ts => { @@ -294,11 +295,17 @@ namespace RookieStation.Construction.ExecuteCmd private static void CreateFloor(Document doc, IList edges) { var floorCurveArray = new CurveArray(); + var floorType = new FilteredElementCollector(doc).OfClass(typeof(FloorType)).Cast().Where(f => f.Name.Contains("地砖")).FirstOrDefault(); + var baseFloorType = new FilteredElementCollector(doc).OfClass(typeof(FloorType)).Cast().Where(f => f.Name.Contains("混凝土")).FirstOrDefault(); for (int i = 0; i < edges.Count; i++) { floorCurveArray.Append(edges[i]); } - doc.Create.NewFloor(floorCurveArray, true); + var floor = doc.Create.NewFloor(floorCurveArray, floorType, doc.ActiveView.GenLevel, true); + var thickness = floor.get_Parameter(BuiltInParameter.FLOOR_ATTR_THICKNESS_PARAM).AsDouble(); + + var baseFloor = doc.Create.NewFloor(floorCurveArray, baseFloorType, doc.ActiveView.GenLevel, true); + baseFloor.get_Parameter(BuiltInParameter.FLOOR_HEIGHTABOVELEVEL_PARAM).Set(-thickness); } /// diff --git a/RookieStation/Construction/Views/WpfAutoModeling.xaml b/RookieStation/Construction/Views/WpfAutoModeling.xaml index cf9c478..c196602 100644 --- a/RookieStation/Construction/Views/WpfAutoModeling.xaml +++ b/RookieStation/Construction/Views/WpfAutoModeling.xaml @@ -6,6 +6,7 @@ xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:local="clr-namespace:RookieStation.Construction.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="模型生成" Width="161" Height="103" MinWidth="300" diff --git a/RookieStation/Drawing/Views/WpfLegendCreator.xaml b/RookieStation/Drawing/Views/WpfLegendCreator.xaml deleted file mode 100644 index 89035fc..0000000 --- a/RookieStation/Drawing/Views/WpfLegendCreator.xaml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RookieStation/Drawing/Views/WpfLegendCreator.xaml.cs b/RookieStation/Drawing/Views/WpfLegendCreator.xaml.cs deleted file mode 100644 index dbc14d3..0000000 --- a/RookieStation/Drawing/Views/WpfLegendCreator.xaml.cs +++ /dev/null @@ -1,29 +0,0 @@ -using HandyControl.Tools; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace RookieStation.Drawing.Views -{ - /// - /// WpfLegendCreator.xaml 的交互逻辑 - /// - public partial class WpfArrangeTags - { - public WpfArrangeTags() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/RookieStation/Finishes/Views/WpfFloorFinishes.xaml b/RookieStation/Finishes/Views/WpfFloorFinishes.xaml index 3cf9ee3..c7f8f86 100644 --- a/RookieStation/Finishes/Views/WpfFloorFinishes.xaml +++ b/RookieStation/Finishes/Views/WpfFloorFinishes.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:RookieStation.Finishes.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="地砖铺设" Width="81" Height="59" MinWidth="280" diff --git a/RookieStation/Finishes/Views/WpfWallFinishes.xaml b/RookieStation/Finishes/Views/WpfWallFinishes.xaml index 79acda5..c72812b 100644 --- a/RookieStation/Finishes/Views/WpfWallFinishes.xaml +++ b/RookieStation/Finishes/Views/WpfWallFinishes.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="墙面装饰" Width="351" Height="116" MinWidth="300" diff --git a/RookieStation/MailingAreaModule/Views/WpfReceptionArea.xaml b/RookieStation/MailingAreaModule/Views/WpfReceptionArea.xaml index 6f130fb..2460fb7 100644 --- a/RookieStation/MailingAreaModule/Views/WpfReceptionArea.xaml +++ b/RookieStation/MailingAreaModule/Views/WpfReceptionArea.xaml @@ -6,6 +6,7 @@ xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:local="clr-namespace:RookieStation.MailingAreaModule.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="前台布置" Width="126" Height="338" MinWidth="420" diff --git a/RookieStation/ParcelAreaModule/Views/WpfEntranceGate.xaml b/RookieStation/ParcelAreaModule/Views/WpfEntranceGate.xaml index deba756..ce46189 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfEntranceGate.xaml +++ b/RookieStation/ParcelAreaModule/Views/WpfEntranceGate.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:RookieStation.ParcelAreaModule.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="入口布置" Width="58" Height="145" MinWidth="200" diff --git a/RookieStation/ParcelAreaModule/Views/WpfExitGate.xaml b/RookieStation/ParcelAreaModule/Views/WpfExitGate.xaml index ea54409..b30da80 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfExitGate.xaml +++ b/RookieStation/ParcelAreaModule/Views/WpfExitGate.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:RookieStation" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="出口布置" Width="0" Height="74" MinWidth="260" diff --git a/RookieStation/ParcelAreaModule/Views/WpfLampsLayout.xaml b/RookieStation/ParcelAreaModule/Views/WpfLampsLayout.xaml index 0521c38..44b9923 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfLampsLayout.xaml +++ b/RookieStation/ParcelAreaModule/Views/WpfLampsLayout.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:RookieStation" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + Title="灯具布置" Width="50" Height="77" MinWidth="280" diff --git a/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml b/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml index 0ed6aad..202e84a 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml +++ b/RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:RookieStation.ParcelAreaModule.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Title="货架端牌" + Title="货架端牌布置" Width="129" Height="140" MinWidth="400" diff --git a/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml b/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml index 2247236..7c7c5a7 100644 --- a/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml +++ b/RookieStation/ParcelAreaModule/Views/WpfShelvesLayout.xaml @@ -7,6 +7,7 @@ xmlns:local="clr-namespace:RookieStation.ParcelAreaModule.Models" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:RookieStation.Utils" + Title="取件区布置" Width="81" Height="396" MinWidth="560" diff --git a/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml b/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml index d495906..a878702 100644 --- a/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml +++ b/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml @@ -7,10 +7,11 @@ xmlns:local="clr-namespace:RookieStation.ProjectConfig" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:sys="clr-namespace:System;assembly=mscorlib" + Title="项目设置" Width="463" Height="112" MinWidth="400" - MinHeight="300" + MinHeight="350" ShowInTaskbar="False" mc:Ignorable="d"> @@ -40,24 +41,19 @@ x:Name="tbProjectName" Grid.Row="0" Height="30" - Margin="0,4,0,4" + Margin="4,4,4,4" VerticalContentAlignment="Center" hc:InfoElement.Title="项目名称：" hc:InfoElement.TitlePlacement="Left" InputMethod.IsInputMethodEnabled="True" TextAlignment="Center" /> - @@ -144,9 +139,9 @@ Grid.Row="2" Grid.Column="1" Height="30" - Margin="0,4,0,3" + Margin="4,4,4,4" VerticalContentAlignment="Center" - hc:InfoElement.Title="设计：" + hc:InfoElement.Title=" 设计：" hc:InfoElement.TitlePlacement="Left" TextAlignment="Center" /> @@ -155,9 +150,9 @@ Grid.Row="3" Grid.Column="1" Height="30" - Margin="0,4,0,4" + Margin="4,4,4,4" VerticalContentAlignment="Center" - hc:InfoElement.Title="校对：" + hc:InfoElement.Title=" 校对：" hc:InfoElement.TitlePlacement="Left" TextAlignment="Center" /> @@ -166,9 +161,9 @@ Grid.Row="4" Grid.Column="1" Height="30" - Margin="0,4,0,4" + Margin="4,4,4,4" VerticalContentAlignment="Center" - hc:InfoElement.Title="审核：" + hc:InfoElement.Title=" 审核：" hc:InfoElement.TitlePlacement="Left" TextAlignment="Center" /> @@ -177,9 +172,9 @@ Grid.Row="5" Grid.Column="1" Height="30" - Margin="0,4,0,4" + Margin="4,4,4,4" VerticalContentAlignment="Center" - hc:InfoElement.Title="审定：" + hc:InfoElement.Title=" 审定：" hc:InfoElement.TitlePlacement="Left" TextAlignment="Center" />