Commit 3e43799f by liulongfei

進度狀態

parent 4eaef4ab
...@@ -258,5 +258,8 @@ ...@@ -258,5 +258,8 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\icon_clear_32x32.png" /> <Resource Include="Icons\icon_clear_32x32.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\icon_init_32x32.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
...@@ -46,6 +46,12 @@ ...@@ -46,6 +46,12 @@
ToolTip="清理内存" Margin="5,0,0,0" ToolTip="清理内存" Margin="5,0,0,0"
IconWidth="24" IconHeight="24" Width="24" Height="24" IconWidth="24" IconHeight="24" Width="24" Height="24"
Command="{Binding TakeClearCommand}"></fcommon:IconButton> Command="{Binding TakeClearCommand}"></fcommon:IconButton>
<!-- 初始化 -->
<fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_init_32x32.png"
Style="{StaticResource IconButton_Menu_Mask}"
ToolTip="初始化" Margin="5,0,0,0"
IconWidth="24" IconHeight="24" Width="24" Height="24"
Command="{Binding TakeInitAllCommand}"></fcommon:IconButton>
</StackPanel> </StackPanel>
</Border> </Border>
...@@ -131,11 +137,16 @@ ...@@ -131,11 +137,16 @@
DisplayMember="Name" ValueMember="GroupID" IsTextEditable="False"></dxe:ComboBoxEditSettings> DisplayMember="Name" ValueMember="GroupID" IsTextEditable="False"></dxe:ComboBoxEditSettings>
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False" <dxg:GridColumn Header="加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False">
Binding="{Binding Path=SceneInfo.TakeInitedProgress}"> <dxg:GridColumn.CellTemplate>
<dxg:GridColumn.EditSettings> <DataTemplate>
<dxe:ProgressBarEditSettings ContentDisplayMode="Value" Minimum="0" Maximum="1" /> <Grid Background="Transparent" ToolTip="{Binding Path=Row.SceneInfo.TakeInitedMessage}">
</dxg:GridColumn.EditSettings> <dxe:ProgressBarEdit Minimum="0" Maximum="1" ContentDisplayMode="Value"
DisplayFormatString="{}{0:P}" Height="30" ShowBorder="False" Background="Transparent"
EditValue="{Binding Path=Row.SceneInfo.TakeInitedProgress}"></dxe:ProgressBarEdit>
</Grid>
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="引擎类型" FieldName="EngineType" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn> <dxg:GridColumn Header="引擎类型" FieldName="EngineType" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn>
<dxg:GridColumn Header="模板类型" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" <dxg:GridColumn Header="模板类型" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"
......
...@@ -50,6 +50,7 @@ namespace VIZ.Package.Module ...@@ -50,6 +50,7 @@ namespace VIZ.Package.Module
this.UpdateCommand = new VCommand(this.Update); this.UpdateCommand = new VCommand(this.Update);
this.TakeClearCommand = new VCommand(this.TakeClear); this.TakeClearCommand = new VCommand(this.TakeClear);
this.TakeInitCommand = new VCommand(this.TakeInit); this.TakeInitCommand = new VCommand(this.TakeInit);
this.TakeInitAllCommand = new VCommand(this.TakeInitAll);
} }
/// <summary> /// <summary>
...@@ -417,6 +418,32 @@ namespace VIZ.Package.Module ...@@ -417,6 +418,32 @@ namespace VIZ.Package.Module
#endregion #endregion
#region TakeInitAllCommand -- 初始化全部命令
/// <summary>
/// 初始化全部命令
/// </summary>
public VCommand TakeInitAllCommand { get; set; }
/// <summary>
/// 初始化全部
/// </summary>
private void TakeInitAll()
{
if (this.SelectedPageGroupModel == null)
return;
if (this.SelectedPageGroupModel.Pages == null || this.SelectedPageGroupModel.Pages.Count == 0)
return;
List<PageModel> pages = this.SelectedPageGroupModel.Pages.ToList();
// 开始初始化
this.pageViewModelHelper.BeginTakeInit(pages);
}
#endregion
// ====================================================================================== // ======================================================================================
// Message // Message
// ====================================================================================== // ======================================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment