ShrlAlgo/SzmediTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复窗口大小问题

Browse Source
This commit is contained in:
ShrlAlgo
2025-09-19 09:18:09 +08:00
parent d71019ac38
commit 3fc465959b
34 changed files with 592 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Szmedi.RvKits/ModelManager/LevelSeparateWin.xaml
View File

@@ -9,8 +9,6 @@
Title="{Binding ProjectName, StringFormat={}构件划分 - {0}}"
Width="500"
Height="400"
MinWidth="400"
MinHeight="400"
d:DataContext="{d:DesignInstance Type=local:LevelSeparateViewModel}"
SizeToContent="Height"
mc:Ignorable="d">
@@ -31,7 +29,10 @@
SelectionUnit="FullRow"
ToolTip="修改划分名称，会填写对应元素的所属楼层属性">
<DataGrid.Columns>
<DataGridCheckBoxColumn Binding="{Binding IsVisible, UpdateSourceTrigger=PropertyChanged}" EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}" ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}">
<DataGridCheckBoxColumn
Binding="{Binding IsVisible, UpdateSourceTrigger=PropertyChanged}"
EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"
ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}">
<DataGridCheckBoxColumn.Header>
<CheckBox Content="可见性" IsChecked="{Binding DataContext.IsAllItemsSelected, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
</DataGridCheckBoxColumn.Header>
@@ -47,7 +48,10 @@
EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"
ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
Header="可见性" />-->
<DataGridTextColumn Binding="{Binding LevelName}" EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" Header="划分">
<DataGridTextColumn
Binding="{Binding LevelName}"
EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
Header="划分">
<DataGridTextColumn.HeaderStyle>
<Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -55,7 +59,10 @@
</Style>
</DataGridTextColumn.HeaderStyle>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding Elements.Count}" Header="构件数" IsReadOnly="True">
<DataGridTextColumn
Binding="{Binding Elements.Count}"
Header="构件数"
IsReadOnly="True">
<DataGridTextColumn.HeaderStyle>
<Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -106,14 +113,23 @@
</ListBox.ItemTemplate>-->
</DataGrid>
<UniformGrid Grid.Row="1" Columns="3">
<CheckBox Content="是否填充颜色区分" IsChecked="{Binding ToFillColor, UpdateSourceTrigger=PropertyChanged}" ToolTip="读取现有划分及根据标高划分命令是否一次性进行颜色填充" />
<CheckBox
Content="是否填充颜色区分"
IsChecked="{Binding ToFillColor, UpdateSourceTrigger=PropertyChanged}"
ToolTip="读取现有划分及根据标高划分命令是否一次性进行颜色填充" />
<!--<CheckBox
x:Name="CBFillLevelName"
Content="是否填写楼层"
IsChecked="{Binding ToFillLevelName, UpdateSourceTrigger=PropertyChanged}"
ToolTip="根据楼层划分命令或直接修改表中的划分列，是否直接赋予构件标高信息" />-->
<Button Command="{Binding ReadCurrentModelCommand}" Content="读取现有划分" ToolTip="获取当前项目的元素，并按所属楼层划分，未填写或没有该属性归为未知楼层，&#13;嵌套共享族、幕墙，会根据主体族，刷新嵌套族属性" />
<Button Command="{Binding GroupByLevelCommand}" Content="根据标高划分" ToolTip="根据标高，对所有构件进行默认划分，具有 所属楼层 属性的构件自动填写，没有的该属性则不填写，&#13;获取未定义或无法填写所属楼层的的构件，请使用读取现有划分命令" />
<Button
Command="{Binding ReadCurrentModelCommand}"
Content="读取现有划分"
ToolTip="获取当前项目的元素，并按所属楼层划分，未填写或没有该属性归为未知楼层，&#13;嵌套共享族、幕墙，会根据主体族，刷新嵌套族属性" />
<Button
Command="{Binding GroupByLevelCommand}"
Content="根据标高划分"
ToolTip="根据标高，对所有构件进行默认划分，具有 所属楼层 属性的构件自动填写，没有的该属性则不填写，&#13;获取未定义或无法填写所属楼层的的构件，请使用读取现有划分命令" />
<Button
Command="{Binding SelectElementsCommand}"
CommandParameter="{Binding SelectedItem, ElementName=ItemsDG}"
@@ -124,7 +140,10 @@
CommandParameter="{Binding SelectedItem, ElementName=ItemsDG}"
Content="填充颜色"
ToolTip="对当前选中的行的元素进行颜色填充" />
<Button Command="{Binding ResetColorOverrideCommand}" Content="重置颜色" ToolTip="将所有已经着色的构件，恢复其默认外观" />
<Button
Command="{Binding ResetColorOverrideCommand}"
Content="重置颜色"
ToolTip="将所有已经着色的构件，恢复其默认外观" />
</UniformGrid>
</Grid>
</controls:MaterialWindow>

10
Szmedi.RvKits/ModelManager/MaterialBatchWin.xaml
View File

@@ -11,11 +11,8 @@
Title="土建材质"
Width="350"
Height="300"
MinWidth="350"
MinHeight="200"
d:DataContext="{d:DesignInstance local:MaterialBatchViewModel}"
SizeToContent="Height"
mc:Ignorable="d">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Closing">
@@ -68,7 +65,10 @@
ToolTip="根据选中的分类框选构件应用材质" />
</StackPanel>
</GroupBox>
<GroupBox Grid.Row="2" Header="自定义材质批处理" Visibility="{Binding IsChecked, ElementName=SwitchToggleButton, Converter={x:Static materialDesign:BooleanToVisibilityConverter.CollapsedInstance}}">
<GroupBox
Grid.Row="2"
Header="自定义材质批处理"
Visibility="{Binding IsChecked, ElementName=SwitchToggleButton, Converter={x:Static materialDesign:BooleanToVisibilityConverter.CollapsedInstance}}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -105,7 +105,7 @@
ItemsSource="{Binding FilteredList, Mode=OneWay}"
SelectedItem="{Binding SelectedMaterial, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectionMode="Single">
<!--<DataGrid.Resources>
<Style TargetType="{x:Type DataGridRow}">
<Style.Triggers>

6
Szmedi.RvKits/ModelManager/ModelReviewViewModel.cs
View File

@@ -1187,9 +1187,9 @@ namespace Szmedi.RvKits.ModelManager
/// 复审意见
/// </summary>
public string ReexamineComment { get; set; }
///// <summary>
///// 意见回复
///// </summary>
/// <summary>
/// 意见回复
/// </summary>
public string ReplyToComment { get; set; }
/// <summary>
/// 详细意见备注

2
Szmedi.RvKits/ModelManager/MoveModelCmd.cs
View File

@@ -200,7 +200,7 @@ namespace Szmedi.RvKits.ModelManager
{
foreach (var elem in elementsBaseFace)
{
sb.AppendLine($"{elem.Id},{elem.Name},基于面主体的图元，不进行移动,");
sb.AppendLine($"{elem.Id},{elem.Name},基于面主体的图元，不进行移动，但可能会因为主体移动而错位，请检查,");
}
}
if (sb.Length > 0)