Skip to content

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

和美安装包_v6.22.2 -20210425 

1. 修复 追边,扫描测厚仪服务器主界面都改回用window控件. 解决 WindowBigClose 找不到MahApps.Brush.Accent 出错。
parent 329a3a93
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 77 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/FLY.Thick.Blowing.UI.Fix.Server.csproj
View file @ e65227a2
......@@ -130,10 +130,6 @@
<Project>{9c46d98f-6500-490b-9e56-c89dfffa05f8}</Project>
<Name>FLY.AppHelper</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.ControlLibrary\FLY.ControlLibrary\FLY.ControlLibrary.csproj">
<Project>{119c3adc-f8e1-4f72-b89b-006236ff8586}</Project>
<Name>FLY.ControlLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.FlyADBase\FlyADBase\FlyADBase.csproj">
<Project>{dd8a6858-1261-49f7-86be-5ac5c3a0ec34}</Project>
<Name>FlyADBase</Name>
......@@ -146,10 +142,6 @@
<Project>{5ee61ac6-5269-4f0f-b8fa-4334fe4a678f}</Project>
<Name>Misc</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.Thick.Base\FLY.Thick.Base.UI\FLY.Thick.Base.UI.csproj">
<Project>{ec84265e-4196-4834-8ac0-81956777c5e9}</Project>
<Name>FLY.Thick.Base.UI</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.Thick.Base\FLY.Thick.Base\FLY.Thick.Base.csproj">
<Project>{91a1aafe-a528-4c2e-a48a-9259e780255a}</Project>
<Name>FLY.Thick.Base</Name>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/MainWindow.xaml
View file @ e65227a2
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Server.MainWindow"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
<Window x:Class="FLY.Thick.Blowing.UI.Fix.Server.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="MainWindow"
Icon="/FLY.Thick.Blowing.UI.Fix.Server;component/BlowingFixServer.ico" SizeToContent="WidthAndHeight">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" >
<StackPanel Orientation="Vertical" >
<StackPanel Orientation="Vertical" Margin="5,20">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeader}" Text="本地地址" />
<TextBlock Text="本地地址" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding LocalEP, Converter={StaticResource ResourceKey=ipepconv}}" MinWidth="250"/>
<TextBlock Text="{Binding LocalEP}" MinWidth="250"/>
</StackPanel>
</StackPanel>
<Button x:Name="btnOpen" Style="{StaticResource ButtonStyle2}" Content="打开图片文件夹" FontSize="25" Width="AUTO" Click="button_open_Click"/>
<Button x:Name="btnOpen" Content="打开图片文件夹" FontSize="25" Width="AUTO" Click="button_open_Click"/>
</StackPanel>
</StackPanel>
</Grid>
</flyctrllib:WindowBigClose>
</Window>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/MainWindow.xaml.cs
View file @ e65227a2
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Forms;
using System.Reflection;
using System.Collections.ObjectModel;
using System.Net;
using FLY.Thick.Blowing.Server;
using FLY.Thick.Blowing.Server;
using FLY.Thick.Blowing.Server.OBJProxy;
using System.Windows;
namespace FLY.Thick.Blowing.UI.Fix.Server
......@@ -25,7 +8,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
/// <summary>
/// MainWindow.xaml 的交互逻辑
/// </summary>
public partial class MainWindow : FLY.ControlLibrary.WindowBigClose
public partial class MainWindow : Window
{
FLY.AppHelper.WindowNotifyIconHelper notifyiconhelper;
TDGage mGage;
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/FLY.Thick.BlowingScan.UI.Server.csproj
View file @ e65227a2
......@@ -113,10 +113,6 @@
<Project>{9c46d98f-6500-490b-9e56-c89dfffa05f8}</Project>
<Name>FLY.AppHelper</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.ControlLibrary\FLY.ControlLibrary\FLY.ControlLibrary.csproj">
<Project>{119c3adc-f8e1-4f72-b89b-006236ff8586}</Project>
<Name>FLY.ControlLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.FlyADBase\FlyADBase\FlyADBase.csproj">
<Project>{dd8a6858-1261-49f7-86be-5ac5c3a0ec34}</Project>
<Name>FlyADBase</Name>
......@@ -129,10 +125,6 @@
<Project>{5ee61ac6-5269-4f0f-b8fa-4334fe4a678f}</Project>
<Name>Misc</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.Thick.Base\FLY.Thick.Base.UI\FLY.Thick.Base.UI.csproj">
<Project>{ec84265e-4196-4834-8ac0-81956777c5e9}</Project>
<Name>FLY.Thick.Base.UI</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.Thick.Base\FLY.Thick.Base\FLY.Thick.Base.csproj">
<Project>{91a1aafe-a528-4c2e-a48a-9259e780255a}</Project>
<Name>FLY.Thick.Base</Name>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/MainWindow.xaml
View file @ e65227a2
<flyctrllib:WindowBigClose
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
<Window
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
x:Class="FLY.Thick.BlowingScan.UI.Server.MainWindow"
Title="MainWindow"
Icon="Server.ico" Height="217" Width="418.952">
<flyctrllib:WindowBigClose.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</flyctrllib:WindowBigClose.Resources>
<Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" >
<StackPanel >
<StackPanel Orientation="Vertical" Margin="5,20">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeader}" Text="本地IP &amp;端口" />
<TextBlock Text="本地IP &amp;端口" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" Text="{Binding LocalEP, Converter={StaticResource ipepconv}}" MinWidth="250" Width="378" />
<TextBlock Text="{Binding LocalEP}" MinWidth="250" Width="378" />
</StackPanel>
</StackPanel>
......@@ -28,4 +19,4 @@
<Button Content="保存调试数据" Padding="20,5" Margin="5" Click="btnSaveBufListClick"/>
</StackPanel>
</Grid>
</flyctrllib:WindowBigClose>
\ No newline at end of file
</Window>
\ No newline at end of file
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/MainWindow.xaml.cs
View file @ e65227a2
using FLY.Thick.BlowingScan.IService;
using FLY.Thick.BlowingScan.Server;
using FLY.Thick.BlowingScan.Server;
using FLY.Thick.BlowingScan.Server.OBJProxy;
using Microsoft.Win32;
using System;
......@@ -7,25 +6,16 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.ServiceModel.Syndication;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FLY.Thick.BlowingScan.UI.Server
{
/// <summary>
/// MainWindow.xaml 的交互逻辑
/// </summary>
public partial class MainWindow : FLY.ControlLibrary.WindowBigClose
public partial class MainWindow : Window
{
FLY.AppHelper.WindowNotifyIconHelper notifyiconhelper;
TDGage mGage;
......@@ -55,11 +45,12 @@ namespace FLY.Thick.BlowingScan.UI.Server
mBufList = mGage.gmRenZiJiaScan.mBufList.ToList();
this.Dispatcher.BeginInvoke(new Action(Save2));
}
void Save2() {
void Save2()
{
SaveFileDialog sfd = new SaveFileDialog();
sfd.DefaultExt = ".csv";
sfd.AddExtension = true;
if (sfd.ShowDialog() == true)
{
Task.Factory.StartNew(() =>
......
脚本/版本描述.txt
View file @ e65227a2
和美安装包_v6.22.2 -20210425
1. 修复 追边,扫描测厚仪服务器主界面都改回用window控件. 解决 WindowBigClose 找不到MahApps.Brush.Accent 出错。
和美安装包_v6.22.1 -20210414
1. 修复 收卷 设备连接变量表_v3_全部合体-20210302 内外收卷设定m,收卷预警m 为放大0.1倍
......
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