Skip to content

H
hemei
Commit d2a3ab60 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

1. integrated 修改界面位置会动 

2. integrated  属性名 Ibc 的PLC自动绑定功能，写错名称
parent ecbcb24a
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 118 deletions
Project.FLY.Integrated/FLY.Integrated.UI.Client/SysParam.cs
View file @ d2a3ab60
......@@ -43,7 +43,7 @@ namespace FLY.Integrated.UI.Client
public SysParam()
{
ServerEP = Misc.StringConverter.ToIPEndPoint("127.0.0.1:19003");
ServerEP = Misc.StringConverter.ToIPEndPoint("127.0.0.1:20003");
if (!Load())
Save();
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/Styles.xaml
View file @ d2a3ab60
......@@ -71,4 +71,14 @@
<Setter Property="Margin" Value="3"/>
<Setter Property="Padding" Value="7,0"/>
</Style>
<sys:Double x:Key="ViewboxH_fs25">34</sys:Double>
<sys:Double x:Key="ViewboxW_fs25_00p0">57</sys:Double>
<sys:Double x:Key="ViewboxW_fs25_0000">64</sys:Double>
<sys:Double x:Key="ViewboxW_fs25_0000p0">85</sys:Double>
<sys:Double x:Key="ViewboxH_fs35">48</sys:Double>
<sys:Double x:Key="ViewboxW_fs35_00p0">71</sys:Double>
<sys:Double x:Key="ViewboxW_fs35_000p0">88</sys:Double>
<sys:Double x:Key="ViewboxW_fs35_0000">93</sys:Double>
<sys:Double x:Key="ViewboxW_fs35_00000p0">121</sys:Double>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/UcIbcPanel.xaml
View file @ d2a3ab60
......@@ -36,7 +36,9 @@
<StackPanel Grid.Row="0" Grid.ColumnSpan="2" >
<TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/>
<StackPanel Orientation="Horizontal">
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding InletAirFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
......@@ -49,7 +51,9 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}">
<TextBox Text="{Binding InletAirFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource HighlightBrush}" VerticalAlignment="Bottom" FontSize="35"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
......@@ -91,7 +95,9 @@
<TextBlock Grid.Row="0" Grid.Column="0" Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/>
<StackPanel Orientation="Horizontal">
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding OutletAirFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
......@@ -104,7 +110,9 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}">
<TextBox Text="{Binding OutletAirFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource HighlightBrush}" VerticalAlignment="Bottom" FontSize="35"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
......@@ -146,7 +154,9 @@
<TextBlock Grid.Row="0" Grid.Column="0" Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/>
<StackPanel Orientation="Horizontal">
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding ExCoolFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
......@@ -160,7 +170,9 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}">
<TextBox Text="{Binding ExCoolFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource HighlightBrush}" VerticalAlignment="Bottom" FontSize="35"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
......@@ -201,7 +213,9 @@
<TextBlock Text="折径显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/>
<StackPanel Orientation="Horizontal">
<Viewbox Width="{StaticResource ViewboxW_fs25_0000}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding FilmWidth,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/>
</Viewbox>
<TextBlock Text="mm" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
......@@ -210,7 +224,9 @@
<StackPanel>
<TextBlock Grid.Row="0" Grid.Column="0" Text="折径设置" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource AccentBaseColorBrush}"/>
<StackPanel Orientation="Horizontal">
<TextBox Text="{Binding FilmWidthSet,StringFormat={}{0:F0}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource HighlightBrush}" VerticalAlignment="Bottom"/>
<Viewbox Width="{StaticResource ViewboxW_fs35_0000}" Height="{StaticResource ViewboxH_fs35}" HorizontalAlignment="Right">
<TextBox Text="{Binding FilmWidthSet,StringFormat={}{0:F0}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource HighlightBrush}" VerticalAlignment="Bottom" HorizontalContentAlignment="Right"/>
</Viewbox>
<TextBlock Text="mm" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
</StackPanel>
......@@ -218,7 +234,9 @@
<StackPanel>
<TextBlock Grid.Row="0" Grid.Column="0" Text="误差校正" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource ValidationSummaryColor5}"/>
<StackPanel Orientation="Horizontal">
<TextBox Text="{Binding ErrorCorrection,StringFormat={}{0:F0}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource ValidationBrush5}" VerticalAlignment="Bottom" FontSize="26"/>
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBox Text="{Binding ErrorCorrection,StringFormat={}{0:F0}}" Style="{StaticResource TextBoxStyle_FieldContent}" Foreground="{StaticResource ValidationBrush5}" VerticalAlignment="Bottom" FontSize="25" HorizontalContentAlignment="Right"/>
</Viewbox>
<TextBlock Text="mm" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml
View file @ d2a3ab60
......@@ -25,6 +25,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Viewbox Margin="30,10">
<StackPanel Orientation="Horizontal">
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
......@@ -37,8 +38,10 @@
</Grid.ColumnDefinitions>
<StackPanel >
<TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" >
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding RotaryFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
......@@ -51,7 +54,9 @@
<StackPanel Grid.Row="1" Grid.ColumnSpan="2" >
<Button Style="{StaticResource ButtonStyle_empty}" Click="btnFreqClick">
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}" HorizontalAlignment="Right">
<TextBlock Text="{Binding RotaryFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="35" Foreground="{StaticResource HighlightBrush}"/>
</Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
</Button>
......@@ -61,8 +66,7 @@
Grid.Row="2" Grid.ColumnSpan="2"
/>
</Grid>
</Viewbox>
<StackPanel Grid.Column="1" >
<StackPanel Grid.Column="1" Margin="50,0,0,0">
<StackPanel Margin="{StaticResource ControlMargin}">
<Button x:Name="btnRotateForw" Style="{StaticResource ButtonStyle_resizeIcon}">
<Grid>
......@@ -82,7 +86,8 @@
<TextBlock Text="转塔反转" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="{StaticResource FontSize_title}" Foreground="{StaticResource TextBrush}" />
</StackPanel>
</StackPanel>
</StackPanel>
</Viewbox>
<Viewbox Grid.Column="2" Margin="30,10" MaxHeight="110" HorizontalAlignment="Left" VerticalAlignment="Top">
<WrapPanel Orientation="Horizontal" >
<StackPanel >
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcTractionPanel/UcTractionPanel.xaml
View file @ d2a3ab60
......@@ -19,11 +19,11 @@
<Border Grid.Row="0" Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Viewbox Margin="30,10">
<StackPanel Orientation="Horizontal">
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
......@@ -36,17 +36,23 @@
</Grid.ColumnDefinitions>
<StackPanel >
<TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/>
<StackPanel Orientation="Horizontal">
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding TractionVelocity,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/>
</Viewbox>
<TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel>
</StackPanel>
<TextBlock Style="{StaticResource HeaderBroadTextStyle}" Text="牵引"
Grid.Column="2"/>
<StackPanel Grid.Row="1" Grid.ColumnSpan="2" >
<Button Style="{StaticResource ButtonStyle_empty}" Click="btnVelocityClick">
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}">
<TextBlock Text="{Binding TractionVelocitySet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="35" Foreground="{StaticResource HighlightBrush}"/>
</Viewbox>
<TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
</Button>
......@@ -56,9 +62,7 @@
Grid.Row="2" Grid.ColumnSpan="2"
/>
</Grid>
</Viewbox>
<Viewbox Margin="30,10" Grid.Column="1" VerticalAlignment="Top">
<Grid >
<Grid Margin="30,0">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
......@@ -76,6 +80,8 @@
Grid.Row="2" Grid.ColumnSpan="2"
/>
</Grid>
</StackPanel>
</Viewbox>
</Grid>
</Border>
......
Project.FLY.Integrated/FLY.Integrated.UI.Server/Properties/AssemblyInfo.cs
View file @ d2a3ab60
......@@ -7,12 +7,12 @@ using System.Windows;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("FLY.IntegratedControl.UI.Server")]
[assembly: AssemblyTitle("IBC综合 服务器")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FLY.IntegratedControl.UI.Server")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyProduct("IBC综合 服务器")]
[assembly: AssemblyCopyright("Copyright © 2019 flyautomation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,5 +51,6 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("5.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
[assembly: Guid("047DC180-6974-441D-9BBD-7FAEACB2E635")]
Project.FLY.Integrated/FLY.Integrated/Client/IntegratedSystemServiceClient.cs
View file @ d2a3ab60
......@@ -62,14 +62,14 @@ namespace FLY.Integrated.Client
syncPropServiceClient = new SyncPropServiceClient(
mServerID + 1,
new Dictionary<string, INotifyPropertyChanged> {
{"IbcData", Ibc },
{"Ibc", Ibc },
{"Accessory", Accessory },
});
PLCos = new PLCProxySystemServiceClient(
OBJ_INTERFACE.OBJ_INTERFACE.IBC_OBJ_PLCOS_ID,
new Dictionary<string, INotifyPropertyChanged> {
{"IbcData", Ibc },
{"Ibc", Ibc },
{"Accessory", Accessory }
});
......
Project.FLY.Integrated/FLY.Integrated/Properties/AssemblyInfo.cs
View file @ d2a3ab60
......@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("FLY.IntegratedControl")]
[assembly: AssemblyTitle("IBC综合 库")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FLY.IntegratedControl")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyProduct("IBC综合 库")]
[assembly: AssemblyCopyright("Copyright © 2019 flyautomation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("5.0.0.0")]
[assembly: AssemblyFileVersion("5.0.0.0")]
Project.FLY.Integrated/FLY.Integrated/Server.OBJProxy/IntegratedSystem_OBJProxy.cs
View file @ d2a3ab60
......@@ -28,7 +28,7 @@ namespace FLY.Integrated.Server.OBJProxy
objsys_idx, ID + 1,
new Dictionary<string, INotifyPropertyChanged>
{
{ "IbcData", data.Ibc},
{ "Ibc", data.Ibc},
{ "Accessory", data.Accessory}
});
......
Project.FLY.Integrated/FLY.Integrated/Server/IntegratedSystem.cs
View file @ d2a3ab60
......@@ -115,7 +115,7 @@ namespace FLY.Integrated.Server
//历史数据记录
//添加任务
PLCos.SetPlan("IbcData", new string[] {
PLCos.SetPlan("Ibc", new string[] {
"FilmWidth","InletAirFreq","OutletAirFreq","ExCoolFreq"
}, 0);
......
Project.FLY.Integrated/FLY.Integrated/Server/SysParam.cs
View file @ d2a3ab60
......@@ -8,7 +8,7 @@ namespace FLY.Integrated.Server
/// <summary>
/// OBJ服务端口
/// </summary>
public int OBJ_Port { get; set; } = 19003;
public int OBJ_Port { get; set; } = 20003;
/// <summary>
/// 数据库保持时间 默认6个月
......
WpfApplication1/WpfApplication1.csproj
View file @ d2a3ab60
......@@ -118,6 +118,10 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Project.FLY.Integrated\FLY.Integrated.UI.Client\FLY.Integrated.UI.Client.csproj">
<Project>{cc941be1-1a92-4830-b8dd-e743939ba8ba}</Project>
<Name>FLY.Integrated.UI.Client</Name>
</ProjectReference>
<ProjectReference Include="..\Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper.UI\FLY.HeatingHelper.UI.csproj">
<Project>{276ee86a-0961-4c69-a38a-696f4d76e931}</Project>
<Name>FLY.HeatingHelper.UI</Name>
......
thick_public @ ceaf9a32
Subproject commit c48adad74c5e13eb68b1f4b5cbf2d0b83da21c39
Subproject commit ceaf9a32048bd4dea7f06f3b306706885574f4b3
脚本/2.get_exe.sh
View file @ d2a3ab60
......@@ -111,6 +111,16 @@ files=(\
)
copy_to2 $src_dir $dest_dir $files
#Project.FLY.Integrated
src_dir="../Project.FLY.Integrated/FLY.Integrated.UI.Server"
dest_dir="FLY.Integrated.UI.Server"
files=(\
"FLY.Integrated.UI.Server.exe" \
"Gage1" "x64" "x86" \
"nlog.config" \
)
copy_to2 $src_dir $dest_dir $files
# Project.FLY.Thick.BlowingScan
......
脚本/install/install.json
View file @ d2a3ab60
......@@ -69,6 +69,13 @@
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Integrated.UI.Server",
"Exe":"FLY.Integrated.UI.Server.exe",
"Name":"IBC综合",
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\LP3",
"Exe":"FLY.LinkProxy.UI.exe",
......
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