From 893dda5b6a6aa06684ac09d2d1739b341d77f669 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Wed, 18 Jan 2017 09:42:22 +0000 Subject: [PATCH] EgtCAM5 : - Aggiornamento attrezzaggio con lettura nuovi Lua. --- EgtCAM5Resources.xaml | 67 +++++ IniFile.vb | 3 + SetUpWindow/SetUpView.xaml | 140 +++++----- SetUpWindow/SetUpViewModel.vb | 489 ++++++++++++++++++++++++---------- 4 files changed, 496 insertions(+), 203 deletions(-) diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml index b214911..bfbcd44 100644 --- a/EgtCAM5Resources.xaml +++ b/EgtCAM5Resources.xaml @@ -614,6 +614,50 @@ + + + + + diff --git a/IniFile.vb b/IniFile.vb index 7f7dde0..bd49b3d 100644 --- a/IniFile.vb +++ b/IniFile.vb @@ -7,6 +7,9 @@ Public Module IniFile Friend m_LastSubEntityId As Integer Friend EgaltechBlue1 As New SolidColorBrush(Color.FromArgb(255, 77, 132, 196)) + Friend EgaltechGreen As New SolidColorBrush(Color.FromArgb(255, 0, 255, 0)) + Friend EgaltechRed As New SolidColorBrush(Color.FromArgb(255, 255, 0, 0)) + Friend EgaltechYellow As New SolidColorBrush(Color.FromArgb(255, 255, 255, 0)) Friend ReferenceContactColRed As New Color3d(255, 0, 0) Friend ReferenceContactColGreen As New Color3d(0, 255, 0) diff --git a/SetUpWindow/SetUpView.xaml b/SetUpWindow/SetUpView.xaml index 600fe39..04f99a8 100644 --- a/SetUpWindow/SetUpView.xaml +++ b/SetUpWindow/SetUpView.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:EgtCAM5" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" - Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico" + Title="{Binding TitleMsg}" Icon="/Resources/EgtCAM5.ico" TitleBarBrush="{StaticResource EgaltechBlue1}" BorderBrush="{StaticResource EgaltechBlue1}" WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False" @@ -23,9 +23,10 @@ -