From fcf53b9902b487b4a49d79de7efcd3e27ec83eab Mon Sep 17 00:00:00 2001
From: Renzo Lanza <renzo.l@egaltech.com>
Date: Wed, 4 Mar 2020 11:27:31 +0000
Subject: [PATCH] =?UTF-8?q?OmagOFFICE=202.2c2=20:=20-=20Gestione=20dei=20p?=
 =?UTF-8?q?arametri=20da=20visualizzare=20per=20ciascun=20utensile=20del?=
 =?UTF-8?q?=20DB=20Utensile=20ora=20=C3=A8=20spostata=20sulla=20libreria?=
 =?UTF-8?q?=20EgtWPFLib5=20(come=20gi=C3=A0=20fatto=20per=20Db=20Lavorazio?=
 =?UTF-8?q?ni)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MachinePanel/MachinePanelVM.vb | 14 ++++++++++----
 My Project/AssemblyInfo.vb     |  4 ++--
 OmagOFFICE.vbproj              |  8 --------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/MachinePanel/MachinePanelVM.vb b/MachinePanel/MachinePanelVM.vb
index 48bb6a9..899e44c 100644
--- a/MachinePanel/MachinePanelVM.vb
+++ b/MachinePanel/MachinePanelVM.vb
@@ -143,10 +143,16 @@ Public Class MachinePanelVM
          MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
-      Dim ToolDbWindow As New ToolDbWindowV(Application.Current.MainWindow, New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx()))
-      ToolDbWindow.Height = 640
-      ToolDbWindow.Width = 1024
-      ToolDbWindow.ShowDialog()
+
+      Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone")
+      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      If ToolDbWindowVM.MatType <> 0 Then
+         ToolDbWindowV.Height = 640
+         ToolDbWindowV.Width = 1024
+         ToolDbWindowV.ShowDialog()
+      Else
+         Exit Sub
+      End If
 
       If Not SetUpUtility.IsValidToolHeadExitInSetUp() Then
          SetUp_Background = Brushes.Red
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index f2ed344..c9bbf9c 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,5 +69,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.2.3.1")>
-<Assembly: AssemblyFileVersion("2.2.3.1")>
+<Assembly: AssemblyVersion("2.2.3.2")>
+<Assembly: AssemblyFileVersion("2.2.3.2")>
diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj
index 0e15f54..b7ffcb8 100644
--- a/OmagOFFICE.vbproj
+++ b/OmagOFFICE.vbproj
@@ -209,10 +209,6 @@
     <Compile Include="MachOptionWindow\MachOptionWindowVM.vb" />
     <Compile Include="MySceneHost\MySceneHostVM.vb" />
     <Compile Include="MySetUpWindow\MySetUpWindowVM.vb" />
-    <Compile Include="MyToolDbWindow\MyToolDbWindowV.xaml.vb">
-      <DependentUpon>MyToolDbWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MyToolDbWindow\MyToolDbWindowVM.vb" />
     <Compile Include="OptionPanel\MachiningTab\MachiningTabV.xaml.vb">
       <DependentUpon>MachiningTabV.xaml</DependentUpon>
     </Compile>
@@ -373,10 +369,6 @@
       <DependentUpon>MainWindowV.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="MyToolDbWindow\MyToolDbWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="OptionPanel\MachiningTab\MachiningTabV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>