diff --git a/RookieStation/Drawing/ExecuteCmds/CmdCreateLightLegend.cs b/RookieStation/Drawing/ExecuteCmds/CmdCreateLightLegend.cs index 23d1404..fe7fab0 100644 --- a/RookieStation/Drawing/ExecuteCmds/CmdCreateLightLegend.cs +++ b/RookieStation/Drawing/ExecuteCmds/CmdCreateLightLegend.cs @@ -84,7 +84,7 @@ namespace RookieStation.Drawing.ExecuteCmds var instance = g2.ElementAt(0); //var wattage = instance.Symbol.get_Parameter(BuiltInParameter.FBX_LIGHT_WATTAGE).AsValueString(); var mark = instance.Symbol.get_Parameter(BuiltInParameter.WINDOW_TYPE_ID).AsString(); - var annotation = instance.Symbol.get_Parameter(BuiltInParameter.ALL_MODEL_TYPE_COMMENTS).AsString(); + var annotation = instance.Symbol.get_Parameter(BuiltInParameter.ALL_MODEL_MODEL).AsString(); var comment = annotation == null ? $"{instance.Symbol.FamilyName}" : $"{instance.Symbol.FamilyName},{annotation}"; var planeLegendTypes = from type in lightAnnotationSymboltypes diff --git a/RookieStation/Drawing/ExecuteCmds/CmdCreateShelvesLegend.cs b/RookieStation/Drawing/ExecuteCmds/CmdCreateShelvesLegend.cs index 582ca3d..25804b8 100644 --- a/RookieStation/Drawing/ExecuteCmds/CmdCreateShelvesLegend.cs +++ b/RookieStation/Drawing/ExecuteCmds/CmdCreateShelvesLegend.cs @@ -148,7 +148,7 @@ namespace RookieStation.Drawing.ExecuteCmds TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableCellWidth * 1.5) + y, "数量", opts); TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableCellWidth * 2.5) + y, "总延米", opts); TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableCellWidth * 3.5) + y, "总承载单量", opts); - TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableCellWidth * 4.5) + y, "设计单量", opts); + TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableCellWidth * 4.5) + y, "日均单量", opts); TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableCellWidth * 5.5) + y, "场地面积", opts); for (int i = 0; i < statistics.Count(); i++) { diff --git a/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml b/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml index 494dd40..62de7aa 100644 --- a/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml +++ b/RookieStation/ProjectConfig/Views/WpfProjectSettings.xaml @@ -104,7 +104,7 @@ Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" - Text="设计单量:" /> + Text="日均单量:" />