MagFluxToolbox initial deviated from GenesisToolBox

This commit is contained in:
Thomas Wiedebusch 2023-04-20 03:27:25 +02:00
parent 0cfb2df9c9
commit 7ff63d4ec7
26 changed files with 670 additions and 236 deletions

View File

@ -161,7 +161,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MjkControlledCodeRef", "Mjk
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "modbus_master_csharp", "..\..\..\MJK\Code\C#\modbus_master_csharp\src\modbus_master_csharp\modbus_master_csharp.csproj", "{F14940F8-3C86-4BB7-A915-B021E4B3052D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagFluxToolBox", "MagFluxToolBox\MagFluxToolBox.csproj", "{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagFluxToolBox", "Ui\MagFluxToolBox\MagFluxToolBox.csproj", "{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@ -3589,70 +3589,70 @@ Global
{F14940F8-3C86-4BB7-A915-B021E4B3052D}.XP32bit|x64.Build.0 = Release|Any CPU
{F14940F8-3C86-4BB7-A915-B021E4B3052D}.XP32bit|x86.ActiveCfg = Release|Any CPU
{F14940F8-3C86-4BB7-A915-B021E4B3052D}.XP32bit|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x64.ActiveCfg = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x64.Build.0 = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x86.ActiveCfg = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x86.Build.0 = Debug|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x86.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Any CPU.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x64.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x64.Build.0 = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x86.ActiveCfg = Release|Any CPU
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x64.ActiveCfg = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x64.Build.0 = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x86.ActiveCfg = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x86.Build.0 = Debug|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x86.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Any CPU.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x64.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x64.Build.0 = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x86.ActiveCfg = Release|Any CPU
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -3725,7 +3725,7 @@ Global
{94579693-7AC6-4FF0-B540-1F3780E1BCFA} = {C9393A97-C0BB-4D59-A879-B572BE04CE15}
{B4F8545B-F379-42A5-BDE9-763FD7B79598} = {C9393A97-C0BB-4D59-A879-B572BE04CE15}
{F14940F8-3C86-4BB7-A915-B021E4B3052D} = {B4F8545B-F379-42A5-BDE9-763FD7B79598}
{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43} = {03D4F23E-7E4A-4091-BC96-036C996D351A}
{A5E7CE52-3101-4E9B-B896-C2C0FADE4812} = {03D4F23E-7E4A-4091-BC96-036C996D351A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4BCB7B69-696C-436A-86F7-C91EA5588164}

View File

@ -28,6 +28,7 @@
<s:Boolean x:Key="/Default/Environment/ExcludedFiles/FilesAndFoldersToSkip/=1057AD21_002DBA22_002D4CAB_002DB3FE_002D88C5C9980E6A_002Fd_003AScripts_002Ff_003Ajquery_002D1_002E10_002E2_002Eintellisense_002Ejs/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">NewVersion</s:String>
<s:Boolean x:Key="/Default/Environment/Hierarchy/EntityFrameworkOptions/IsAlreadyNotifiedAboutEntityFramework/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Thomas\AppData\Local\Temp\JetBrains\ReSharperPlatformVs15\vAny_33007af5\CoverageData\_Common.-1885154465\Snapshot\snapshot.utdcvr</s:String>

View File

@ -1,9 +0,0 @@
<Application x:Class="MagFluxToolBox.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:MagFluxToolBox"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>

View File

@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace MagFluxToolBox
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}

View File

@ -1,12 +0,0 @@
<Window x:Class="MagFluxToolBox.MainWindow"
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"
xmlns:local="clr-namespace:MagFluxToolBox"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
</Grid>
</Window>

View File

@ -1,28 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
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 MagFluxToolBox
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
}
}

View File

@ -1,7 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

View File

@ -1,5 +1,4 @@
using GenesisToolBox;
using System;
using System;
using System.Windows.Forms;
namespace Xylem.Common.Ui.GenesisToolBox

View File

@ -4,14 +4,12 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}</ProjectGuid>
<ProjectGuid>{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>MagFluxToolBox</RootNamespace>
<AssemblyName>MagFluxToolBox</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
@ -35,70 +33,86 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<Compile Include="FrmMainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmMainForm.Designer.cs">
<DependentUpon>FrmMainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="FrmMainForm.resx">
<DependentUpon>FrmMainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\MJK\Code\C#\modbus_master_csharp\src\modbus_master_csharp\modbus_master_csharp.csproj">
<Project>{f14940f8-3c86-4bb7-a915-b021e4b3052d}</Project>
<Name>modbus_master_csharp</Name>
<ProjectReference Include="..\..\CommonCore\CommonCore.csproj">
<Project>{1B02C79E-0B19-43E2-8F6B-71EF0C786C97}</Project>
<Name>CommonCore</Name>
</ProjectReference>
<ProjectReference Include="..\..\SoftwareAccessHelper\SoftwareAccessHelper.csproj">
<Project>{a33e3c6d-eaae-4a20-a0ee-f9e6922fd029}</Project>
<Name>SoftwareAccessHelper</Name>
</ProjectReference>
<ProjectReference Include="..\..\Utils\Logging\Logging.csproj">
<Project>{4B88B0D3-E791-4774-9521-EABEACDC420E}</Project>
<Name>Logging</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="NlogConfig.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\MagFluxVerySmall.jpg" />
<None Include="Resources\MagFluxSmall.jpg" />
<None Include="Resources\MjK-LogoSmall.jpg" />
<None Include="Resources\MjK-Logo.JPG" />
<None Include="Resources\MJK Logo.bmp" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<variable name="BasePath" value="C:\MagFluxLog\"/>
<targets>
<!--CalibrationHelper-->
<target name="CalibrationHelper" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\CalibrationHelper.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_CalibrationHelper.log" />
<!--LedRawData-->
<target xsi:type="BufferingWrapper"
name="TargetLedRawDataBase"
bufferSize="10000"
flushTimeout="-1"
slidingTimeout="true"
>
<target name="LedRawDataBase" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\LedRawData_BASE.log" CreateDirs="True" layout ="${longdate} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_LedRawData_BASE.log" />
</target>
<!--MeterBatch-->
<target name="MeterBatch" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\Meter_BASE.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_Meter_BASE.log" />
<!--Meter-->
<target name="MeterBase" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\Meter_BASE.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_Meter_BASE.log" />
<target name="Slot:0" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\Meter_SlotSlot:0.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_Meter_SlotSlot:0.log" />
<!--COM-->
<target name="COMBase" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\COM_BASE.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_COM_BASE.log" />
<!--MagFluxToolBox-->
<target name="MagFluxToolBox" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\MagFluxToolBox.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_ServiceFwUpdateBuilder.log" />
<!--default-->
<target name="default" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\default.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_default.log" />
<target name="PreAdjWr" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\PreAdjWr.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" />
<target name="ctlBatch" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\ctlBatch.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" archiveAboveSize="50000000" archiveFileName="C:\MagFluxLog\${shortdate}\${processname}\{##}_ctlBatch.log" />
<target name="StreamingQualityFile" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\StreamingQuality.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" />
<target name="ProductionUIFile" xsi:type="File" fileName="${BasePath}\${shortdate}\${processname}\ProductionUIFile.log" CreateDirs="True" layout ="${longdate} | ${level} | ${message} ${exception:format=toString}" />
</targets>
<rules>
<!--MagFluxToolBox-->
<logger name="MagFluxToolBox" minLevel="Trace" appendTo="MagFluxToolBox"/>
<!--CalibrationHelper-->
<logger name="CalibrationHelper" minLevel="Trace" appendTo="CalibrationHelper"/>
<!--LedRawData-->
<logger name="LedRawDataBase" minLevel="Trace" appendTo="TargetLedRawDataBase"/>
<!--MeterBatch-->
<logger name="MeterBatch" minLevel="Trace" appendTo="MeterBatch"/>
<!--Meter-->
<logger name="MeterBase" minLevel="Trace" appendTo="MeterBase"/>
<logger name="Slot:0" minLevel="Trace" appendTo="Slot:0"/>
<logger name="GenesisRequestProtocolBase" minLevel="Trace" appendTo="MeterBase"/>
<logger name="MeasurementBase" minLevel="Trace" appendTo="MeterBase"/>
<!--COM-->
<logger name="SerialComPortBase" minLevel="Trace" appendTo="COMBase"/>
<logger name="IrdaBase" minLevel="Trace" appendTo="COMBase"/>
<logger name="RfidBase" minLevel="Trace" appendTo="COMBase"/>
<logger name="TransmitProtocolBase" minLevel="Trace" appendTo="COMBase"/>
<!--default-->
<logger name="*" minLevel="Debug" appendTo="default"/>
<!--Ui logger-->
<logger name="ctlBatch" minLevel="Trace" appendTo="ctlBatch"/>
<logger name="StreamingQuality" minLevel="Trace" appendTo="StreamingQualityFile"/>
<logger name="PreAdjWr" minLevel="Trace" appendTo="PreAdjWr"/>
<logger name="ProductionUI" minLevel="Trace" appendTo="ProductionUIFile"/>
</rules>
</nlog>

View File

@ -0,0 +1,19 @@
using System;
using System.Windows.Forms;
namespace Xylem.Common.Ui.MagFluxToolBox
{
internal static class Program
{
/// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FrmMainForm());
}
}
}

View File

@ -1,8 +1,6 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@ -21,25 +19,8 @@ using System.Windows;
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a5e7ce52-3101-4e9b-b896-c2c0fade4812")]
// Version information for an assembly consists of the following four values:
//

View File

@ -8,10 +8,10 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace MagFluxToolBox.Properties
{
namespace MagFluxToolBox.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@ -19,53 +19,65 @@ namespace MagFluxToolBox.Properties
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MagFluxToolBox.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set
{
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap MagFluxVerySmall {
get {
object obj = ResourceManager.GetObject("MagFluxVerySmall", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap MjK_LogoSmall {
get {
object obj = ResourceManager.GetObject("MjK_LogoSmall", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
@ -109,9 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MagFluxVerySmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MagFluxVerySmall.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MjK_LogoSmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MjK-LogoSmall.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,139 @@
namespace Xylem.Common.Ui.MagFluxToolBox
{
partial class FrmMainForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.gpGerneral = new System.Windows.Forms.GroupBox();
this.btnTest = new System.Windows.Forms.Button();
this.btnSetup = new System.Windows.Forms.Button();
this.lblVersionNumber = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.picLogo = new System.Windows.Forms.PictureBox();
this.gpGerneral.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picLogo)).BeginInit();
this.SuspendLayout();
//
// gpGerneral
//
this.gpGerneral.Controls.Add(this.btnTest);
this.gpGerneral.Controls.Add(this.btnSetup);
this.gpGerneral.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.gpGerneral.Location = new System.Drawing.Point(12, 110);
this.gpGerneral.Name = "gpGerneral";
this.gpGerneral.Size = new System.Drawing.Size(181, 245);
this.gpGerneral.TabIndex = 19;
this.gpGerneral.TabStop = false;
this.gpGerneral.Text = "General";
//
// btnTest
//
this.btnTest.Location = new System.Drawing.Point(6, 61);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(152, 40);
this.btnTest.TabIndex = 19;
this.btnTest.Text = "Test";
this.btnTest.UseVisualStyleBackColor = true;
this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
//
// btnSetup
//
this.btnSetup.Location = new System.Drawing.Point(6, 15);
this.btnSetup.Name = "btnSetup";
this.btnSetup.Size = new System.Drawing.Size(152, 40);
this.btnSetup.TabIndex = 1;
this.btnSetup.Text = "Setup";
this.btnSetup.UseVisualStyleBackColor = true;
this.btnSetup.Click += new System.EventHandler(this.btnSetup_Click);
//
// lblVersionNumber
//
this.lblVersionNumber.AutoSize = true;
this.lblVersionNumber.Location = new System.Drawing.Point(156, 5);
this.lblVersionNumber.Name = "lblVersionNumber";
this.lblVersionNumber.Size = new System.Drawing.Size(37, 13);
this.lblVersionNumber.TabIndex = 23;
this.lblVersionNumber.Text = "----------";
//
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pictureBox1.Image = global::MagFluxToolBox.Properties.Resources.MagFluxVerySmall;
this.pictureBox1.Location = new System.Drawing.Point(12, 5);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(84, 90);
this.pictureBox1.TabIndex = 25;
this.pictureBox1.TabStop = false;
//
// picLogo
//
this.picLogo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picLogo.Image = global::MagFluxToolBox.Properties.Resources.MjK_LogoSmall;
this.picLogo.InitialImage = null;
this.picLogo.Location = new System.Drawing.Point(293, 5);
this.picLogo.Name = "picLogo";
this.picLogo.Size = new System.Drawing.Size(91, 58);
this.picLogo.TabIndex = 24;
this.picLogo.TabStop = false;
//
// FrmMainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(390, 367);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.picLogo);
this.Controls.Add(this.lblVersionNumber);
this.Controls.Add(this.gpGerneral);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.MaximizeBox = false;
this.MaximumSize = new System.Drawing.Size(410, 410);
this.MinimumSize = new System.Drawing.Size(410, 410);
this.Name = "FrmMainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "MagFlux ToolBox";
this.Load += new System.EventHandler(this.FrmMainForm_Load);
this.gpGerneral.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picLogo)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.GroupBox gpGerneral;
private System.Windows.Forms.Button btnSetup;
private System.Windows.Forms.Label lblVersionNumber;
private System.Windows.Forms.Button btnTest;
private System.Windows.Forms.PictureBox picLogo;
private System.Windows.Forms.PictureBox pictureBox1;
}
}

View File

@ -0,0 +1,127 @@
using System;
using System.IO;
using System.Reflection;
using System.Windows.Forms;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Utils.Logging;
namespace Xylem.Common.Ui.MagFluxToolBox
{
/// <inheritdoc />
public partial class FrmMainForm : Form
{
private readonly String _configFile =
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"MagFlux", ProgramConfig.SerialConfigFileName);
/// <summary>
/// Ctor
/// </summary>
public FrmMainForm()
{
InitializeComponent();
var logger = NLogHelper.CreateOrGetLogger("MagFluxToolBox");
var version = Assembly.GetExecutingAssembly().GetName().Version;
logger.Info($"MagFluxToolBox Version: {version.Major}.{version.Minor}.{version.Build}");
lblVersionNumber.Text = $@"Version: {version.Major}.{version.Minor}.{version.Build}";
}
private void Form_Closed(Object sender, EventArgs e)
{
Show();
}
private void FrmMainForm_Load(Object sender, EventArgs e)
{
var versionString = "NA";
Boolean access;
try
{
var assemblyName = Assembly.GetExecutingAssembly().GetName();
versionString = $@"Version: {assemblyName.Version.Major}.{assemblyName.Version.Minor}.{assemblyName.Version.Build}";
access = Logic.SoftwareAccessHelper.Access.HasAccess(assemblyName);
}
catch (Exception ex)
{
MessageBox.Show(@"MagFluxToolBox\n\n" +
@"Starting in OfflineMode\n\n" +
$@"Your version ({versionString}) could not be verified Error\n\n" +
ex.Message);
Close();
CheckConfigs();
foreach (var item in Controls)
{
if (item is Button btn)
{
btn.Enabled = btn.Name == btnSetup.Name;
}
}
return;
}
if (!access)
{
MessageBox.Show(@"MagFluxToolBox\n\n" +
@"Your version licence has expired\n\n" +
versionString);
Close();
}
if (System.Diagnostics.Debugger.IsAttached)
{
//btnFiles.Enabled = true;
}
CheckConfigs();
}
private void CheckConfigs()
{
var nLogFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"MagFlux", ProgramConfig.NlogConfig);
var dir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "MagFlux");
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}
if (!File.Exists(nLogFile))
{
const String fileCop = ProgramConfig.NlogConfig;
try
{
File.Copy(fileCop, nLogFile);
}
catch (Exception)
{
MessageBox.Show(@"Unable to create log files!");
}
}
if (!File.Exists(_configFile))
{
var text = "Configuration file cannot be found!\nExecute setup.";
MessageBox.Show(text);
}
}
private void btnSetup_Click(Object sender, EventArgs e)
{
//var form = new FrmSetup();
//form.Show();
//form.Closed += Form_Closed;
//Hide();
}
private void btnTest_Click(Object sender, EventArgs e)
{
//var form = new FrmTest();
//form.Show();
//form.Closed += Form_Closed;
//Hide();
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="4.6.7" targetFramework="net48" />
</packages>