窗口标题

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<Curve> edges)
         {
             var floorCurveArray = new CurveArray();
+            var floorType = new FilteredElementCollector(doc).OfClass(typeof(FloorType)).Cast<FloorType>().Where(f => f.Name.Contains("地砖")).FirstOrDefault();
+            var baseFloorType = new FilteredElementCollector(doc).OfClass(typeof(FloorType)).Cast<FloorType>().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);
         }
 
         /// <summary>

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"

RookieStation/Drawing/Views/WpfLegendCreator.xaml

@@ -1,29 +0,0 @@
-<Window
-    x:Class="RookieStation.Drawing.Views.WpfArrangeTags"
-    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.Drawing.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    MinWidth="300"
-    MinHeight="495"
-    mc:Ignorable="d">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <GroupBox>
-            <StackPanel>
-                <RadioButton Content="左对齐" />
-                <RadioButton Content="右对齐" />
-            </StackPanel>
-        </GroupBox>
-        <GroupBox>
-            <StackPanel>
-                <hc:TextBox />
-            </StackPanel>
-        </GroupBox>
-    </Grid>
-</Window>

RookieStation/Drawing/Views/WpfLegendCreator.xaml.cs

@@ -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
-{
-    /// <summary>
-    /// WpfLegendCreator.xaml 的交互逻辑
-    /// </summary>
-    public partial class WpfArrangeTags
-    {
-        public WpfArrangeTags()
-        {
-            InitializeComponent();
-        }
-    }
-}

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"

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"

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"

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"

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"

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"

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"

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"

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">
     <Window.Resources>
@@ -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" />
-        <Separator
-            Grid.Row="0"
-            Grid.ColumnSpan="2"
-            Margin="0,0,0,2"
-            VerticalAlignment="Bottom" />
 
         <!--  允许输出法  -->
         <hc:TextBox
             x:Name="tbConstrctionOrg"
             Grid.Row="1"
             Height="30"
-            Margin="0,4,0,4"
+            Margin="4,4,4,4"
             VerticalContentAlignment="Center"
             hc:InfoElement.Title="建设单位："
             hc:InfoElement.TitlePlacement="Left"
@@ -69,7 +65,7 @@
             x:Name="tbPhase"
             Grid.Row="2"
             Height="30"
-            Margin="0,4,0,3"
+            Margin="4,4,4,4"
             VerticalContentAlignment="Center"
             hc:InfoElement.Title="设计阶段："
             hc:InfoElement.TitlePlacement="Left"
@@ -78,8 +74,7 @@
             x:Name="tbHeight"
             Grid.Row="3"
             Height="30"
-            Margin="0,4,0,4"
+            Margin="4,4,4,4"
-            hc:InfoElement.Necessary="True"
             hc:InfoElement.Title="层高(mm)："
             hc:InfoElement.TitlePlacement="Left"
             InputMethod.IsInputMethodEnabled="False"
@@ -89,7 +84,7 @@
             x:Name="tbOrders"
             Grid.Row="4"
             Height="30"
-            Margin="0,4,0,4"
+            Margin="4,4,4,4"
             VerticalContentAlignment="Center"
             hc:InfoElement.Title="日均单量："
             hc:InfoElement.TitlePlacement="Left"
@@ -100,7 +95,7 @@
             x:Name="tbScale"
             Grid.Row="5"
             Height="30"
-            Margin="0,4,0,4"
+            Margin="4,4,4,4"
             VerticalContentAlignment="Center"
             hc:InfoElement.Title="比例尺：1/"
             hc:InfoElement.TitlePlacement="Left"
@@ -111,7 +106,7 @@
             x:Name="tpDate"
             Grid.Row="6"
             Height="30"
-            Margin="0,4,0,4"
+            Margin="4,4,4,4"
             VerticalContentAlignment="Center"
             hc:InfoElement.Title="图纸日期："
             hc:InfoElement.TitlePlacement="Left"
@@ -123,7 +118,7 @@
             Grid.Row="0"
             Grid.Column="1"
             Height="30"
-            Margin="0,4,0,4"
+            Margin="4,4,4,4"
             VerticalContentAlignment="Center"
             hc:InfoElement.Title="负责人："
             hc:InfoElement.TitlePlacement="Left"
@@ -133,9 +128,9 @@
             Grid.Row="1"
             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" />
 
@@ -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" />
         <Button

RookieStation/RookieStation.csproj

@@ -124,9 +124,6 @@
     <Compile Include="Drawing\Models\LightingDevices.cs" />
     <Compile Include="Drawing\Models\MaterialItem.cs" />
     <Compile Include="Drawing\Models\ShelfStatistic.cs" />
-    <Compile Include="Drawing\Views\WpfLegendCreator.xaml.cs">
-      <DependentUpon>WpfLegendCreator.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MailingAreaModule\ExecuteCmd\WallDivide.cs" />
     <Compile Include="Statistics\ExecuteCmd\CmdExportOrderQuantity.cs" />
     <Compile Include="Statistics\ExecuteCmd\ExportWorkSchedule.cs" />
@@ -248,10 +245,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Drawing\Views\WpfLegendCreator.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ParcelAreaModule\Views\WpfEntranceGate.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

RookieStation/RsApp.cs

@@ -99,7 +99,7 @@ namespace RookieStation.RibbonMenu
                 RibbonPanel projectPanel = application.CreateRibbonPanel(TabName, ProjectSettingsPanelName);
 
                 NewPushButtonData<ProjectSettings>(projectPanel, "项目设置", Properties.Resources.cainiao, null);
-                NewPushButtonData<AutoGenerateModels>(projectPanel, "创建模型", Properties.Resources.Architect, null);
+                NewPushButtonData<AutoGenerateModels>(projectPanel, "创建模型", Properties.Resources.Architect, ViewPlanCmdEnabled);
                 //前台布置
                 RibbonPanel receptionAreaPanel = application.CreateRibbonPanel(TabName, ReceptionPanelName);
 

RookieStation/ScheduleTools/ExecuteCmd/UpdateSheetContents.cs

@@ -120,7 +120,7 @@ namespace RookieStation.ScheduleTools.ExecuteCmd
                             }
                         }
                     }
-                });
+                }, "更新图纸目录");
             }
             catch (Exception)
             {

RookieStationSetup/RookieStationSetup.vdproj

@@ -2402,15 +2402,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:菜鸟驿站工具集"
-        "ProductCode" = "8:{A89A1A7A-C158-48AC-B2F8-9E58AB3803EF}"
+        "ProductCode" = "8:{33F732DA-22DF-4FB3-BA10-91AD7C2662FF}"
-        "PackageCode" = "8:{5A91900E-60D4-4058-8F1E-381AE6BA4ED0}"
+        "PackageCode" = "8:{67553632-A83F-4028-A13A-3CBA3FB5243B}"
         "UpgradeCode" = "8:{127EC3EC-7539-468B-84EA-E1ECDD6204E6}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.12"
+        "ProductVersion" = "8:1.0.0"
         "Manufacturer" = "8:YTX Engineering"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -2881,7 +2881,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_106061D90DD7421EAB1EE10373608018"
             {
-            "SourcePath" = "8:..\\AddinDeployer\\obj\\Release\\AddinDeployer.dll"
+            "SourcePath" = "8:..\\AddinDeployer\\obj\\Debug\\AddinDeployer.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
@@ -2909,7 +2909,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBE461B9D4BD4603919E2821D88FB7CB"
             {
-            "SourcePath" = "8:..\\RookieStation\\obj\\Release\\RookieStation.dll"
+            "SourcePath" = "8:..\\RookieStation\\obj\\Debug\\RookieStation.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"