Skip to content

V
VIZ.Package
Commit d92fbea6 by liulongfei
Options

添加控制字段聚焦

parent 60ee21fa
Showing with 159 additions and 160 deletions
VIZ.Package.Module.Resource/Icons/checked_36x36.png
VIZ.Package.Module.Resource/Icons/checked_36x36.png

3.21 KB | W: | H:

VIZ.Package.Module.Resource/Icons/checked_36x36.png

3.08 KB | W: | H:

VIZ.Package.Module.Resource/Icons/checked_36x36.png
VIZ.Package.Module.Resource/Icons/checked_36x36.png
VIZ.Package.Module.Resource/Icons/checked_36x36.png
VIZ.Package.Module.Resource/Icons/checked_36x36.png
  • 2-up
  • Swipe
  • Onion skin
VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj
...@@ -182,5 +182,8 @@ ...@@ -182,5 +182,8 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\checked_36x36.png" /> <Resource Include="Icons\checked_36x36.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\image_20x20.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm" xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage" xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage"
xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource" xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
xmlns:local="clr-namespace:VIZ.Package.Module" xmlns:local="clr-namespace:VIZ.Package.Module"
...@@ -70,10 +71,12 @@ ...@@ -70,10 +71,12 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" AllowResizing="False"> <dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" MinWidth="20" MaxWidth="300" AllowResizing="True">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Image Width="120" Source="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"></Image> <fcommon:ResizeImageControl ImageSource="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"
IconSource="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"
ShowImageMinWidth="30" ShowImageMinHeight="30"></fcommon:ResizeImageControl>
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
......
VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm" xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage" xmlns:storage="clr-namespace:VIZ.Package.Storage;assembly=VIZ.Package.Storage"
xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource" xmlns:resource="clr-namespace:VIZ.Package.Module.Resource;assembly=VIZ.Package.Module.Resource"
xmlns:local="clr-namespace:VIZ.Package.Module" xmlns:local="clr-namespace:VIZ.Package.Module"
...@@ -47,10 +48,12 @@ ...@@ -47,10 +48,12 @@
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
<dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" AllowResizing="False"> <dxg:GridColumn Header="缩略图" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="120" MinWidth="20" MaxWidth="300" AllowResizing="True">
<dxg:GridColumn.CellTemplate> <dxg:GridColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Image Source="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"></Image> <fcommon:ResizeImageControl ImageSource="{Binding Path=Row.ThumbnailBitmap,Converter={StaticResource Bitmap2ImageSourceConverter}}"
IconSource="/VIZ.Package.Module.Resource;component/Icons/image_20x20.png"
ShowImageMinWidth="30" ShowImageMinHeight="30"></fcommon:ResizeImageControl>
</DataTemplate> </DataTemplate>
</dxg:GridColumn.CellTemplate> </dxg:GridColumn.CellTemplate>
</dxg:GridColumn> </dxg:GridColumn>
......
VIZ.Package.Module/Preview/VizPreview/View/VizPreviewView.xaml
...@@ -52,23 +52,14 @@ ...@@ -52,23 +52,14 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"> <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
<CheckBox Content="TA" Style="{StaticResource CheckBox_Preview_TA}" Margin="5,0,0,0"> <CheckBox Content="TA" Style="{StaticResource CheckBox_Preview_TA}" Margin="5,0,0,0"
<dxmvvm:Interaction.Behaviors> IsChecked="{Binding Path=IsShowTS,Mode=TwoWay}">
<dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowTSCommand}"></dxmvvm:EventToCommand>
<dxmvvm:EventToCommand EventName="Unchecked" Command="{Binding Path=HideTSCommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors>
</CheckBox> </CheckBox>
<CheckBox Content="SA" Style="{StaticResource CheckBox_Preview_SA}" Margin="5,0,0,0"> <CheckBox Content="SA" Style="{StaticResource CheckBox_Preview_SA}" Margin="5,0,0,0"
<dxmvvm:Interaction.Behaviors> IsChecked="{Binding Path=IsShowSA,Mode=TwoWay}">
<dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowSACommand}"></dxmvvm:EventToCommand>
<dxmvvm:EventToCommand EventName="Unchecked" Command="{Binding Path=HideSACommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors>
</CheckBox> </CheckBox>
<CheckBox Content="BB" Style="{StaticResource CheckBox_Preview_BB}" Margin="5,0,0,0"> <CheckBox Content="BB" Style="{StaticResource CheckBox_Preview_BB}" Margin="5,0,0,0"
<dxmvvm:Interaction.Behaviors> IsChecked="{Binding Path=IsShowBB,Mode=TwoWay}">
<dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowBBCommand}"></dxmvvm:EventToCommand>
<dxmvvm:EventToCommand EventName="Unchecked" Command="{Binding Path=HideBBCommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors>
</CheckBox> </CheckBox>
<RadioButton Content="RGB" Style="{StaticResource RadioButton_Preview_RGB}" <RadioButton Content="RGB" Style="{StaticResource RadioButton_Preview_RGB}"
......
VIZ.Package.Service/Viz/VizCommandControlObjectService.cs
...@@ -356,6 +356,29 @@ namespace VIZ.Package.Service ...@@ -356,6 +356,29 @@ namespace VIZ.Package.Service
} }
/// <summary> /// <summary>
/// 设置控制字段聚焦
/// </summary>
/// <param name="conn">连接</param>
/// <param name="obj">控制对象</param>
/// <param name="field">控制字段</param>
public void ShowFocus(ConnModel conn, ControlObjectModel obj, ControlFieldNodeModel field)
{
if (conn == null)
throw new ArgumentNullException(nameof(conn));
VizConfigEntity config = ApplicationDomainEx.VizConfig;
if (config.EngineFullType == EngineFullType.VIZ_Eng3)
{
conn.EndpointManager.Send($"RENDERER*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET FOCUS {field.FieldIdentifier}");
}
else if (config.EngineFullType == EngineFullType.VIZ_Eng4)
{
conn.EndpointManager.Send($"{ApplicationDomainEx.VizPreviewRenderer}*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET FOCUS {field.FieldIdentifier}");
}
}
/// <summary>
/// 获取控制字段类型 /// 获取控制字段类型
/// </summary> /// </summary>
/// <param name="type">字段类型</param> /// <param name="type">字段类型</param>
......
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