From bee06b19990423339c156105308af5f554d2a0fd Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 1 Dec 2023 16:53:08 +0100
Subject: [PATCH 1/3] EgtCAM5 2.5l1 : - ricompilazione con cambio versione.

---
 MainWindow/MainWindowVM.vb | 4 ++--
 My Project/AssemblyInfo.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index e03c675..fc3bd46 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -388,8 +388,8 @@ Public Class MainWindowVM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2511, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2511, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2512, 1, IniFile.m_nKeyOptions)
       ' Leggo e imposto livello utilizzatore
       IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Imposto abilitazione lavorazioni avanzate
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 57d32e0..7feb464 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.11.2")>
-<Assembly: AssemblyFileVersion("2.5.11.2")>
+<Assembly: AssemblyVersion("2.5.12.1")>
+<Assembly: AssemblyFileVersion("2.5.12.1")>
 

From 7dc34348ed19ad2f3609908ce0dd9b9df006392f Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Mon, 18 Dec 2023 10:33:10 +0100
Subject: [PATCH 2/3] =?UTF-8?q?EgtCAM5=202.5l2=20:=20-=20all'uscita=20dal?=
 =?UTF-8?q?=20DB=20lavorazioni=20se=20in=20modalit=C3=A0=20lavora=20si=20a?=
 =?UTF-8?q?ggiorna=20subito=20la=20lista=20delle=20lavorazioni=20inseribil?=
 =?UTF-8?q?i.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MachinePanel/MyMachinePanelVM.vb | 1 +
 My Project/AssemblyInfo.vb       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index 068edf3..2d7bc16 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -283,6 +283,7 @@ Public Class MyMachinePanelVM
          MachDbWindowV.Width = 1024
          MachDbWindowV.Owner = Application.Current.MainWindow
          MachDbWindowV.ShowDialog()
+         If Not IsNothing(Map.refMachiningTreeExpanderVM) Then Map.refMachiningTreeExpanderVM.UpdateOperationMachiningList()
       End If
    End Sub
 
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 7feb464..cf23d9d 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.12.1")>
-<Assembly: AssemblyFileVersion("2.5.12.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>
 

From 3154944f94532778ae865c8d6fa89081f3d928c9 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Fri, 29 Dec 2023 13:22:26 +0100
Subject: [PATCH 3/3] EgtCAM5 2.5l3 : - aggiunta vista da sotto e riordinati
 bottoni per comandi vista in toolbar - riordinati bottoni per comandi griglia
 in toolbar.

---
 GridPanel/GridPanelV.xaml  | 10 +++++-----
 My Project/AssemblyInfo.vb |  4 ++--
 ViewPanel/ViewPanelV.xaml  |  9 ++++++---
 ViewPanel/ViewPanelVM.vb   | 29 +++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/GridPanel/GridPanelV.xaml b/GridPanel/GridPanelV.xaml
index a6aa234..7fb3e1e 100644
--- a/GridPanel/GridPanelV.xaml
+++ b/GridPanel/GridPanelV.xaml
@@ -6,20 +6,20 @@
       <Button Command="{Binding CPlaneTopCommand}" ToolTip="{Binding CPlaneTopToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
       </Button>
+      <Button Command="{Binding CPlaneBottomCommand}" ToolTip="{Binding CPlaneBottomToolTip}" Style="{StaticResource GridViewPanelButton}">
+         <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+      </Button>
       <Button Command="{Binding CPlaneFrontCommand}" ToolTip="{Binding CPlaneFrontToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneRightCommand}" ToolTip="{Binding CPlaneRightToolTip}" Style="{StaticResource GridViewPanelButton}">
-         <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
-      </Button>
       <Button Command="{Binding CPlaneBackCommand}" ToolTip="{Binding CPlaneBackToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding CPlaneLeftCommand}" ToolTip="{Binding CPlaneLeftToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneBottomCommand}" ToolTip="{Binding CPlaneBottomToolTip}" Style="{StaticResource GridViewPanelButton}">
-         <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+      <Button Command="{Binding CPlaneRightCommand}" ToolTip="{Binding CPlaneRightToolTip}" Style="{StaticResource GridViewPanelButton}">
+         <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding CPlaneElevationCommand}" ToolTip="{Binding CPlaneElevationToolTip}" Style="{StaticResource GridViewPanelButton}">
          <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index cf23d9d..7fb595c 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.12.2")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.5.12.3")>
+<Assembly: AssemblyFileVersion("2.5.12.3")>
 
diff --git a/ViewPanel/ViewPanelV.xaml b/ViewPanel/ViewPanelV.xaml
index e7b906a..5fcdd2c 100644
--- a/ViewPanel/ViewPanelV.xaml
+++ b/ViewPanel/ViewPanelV.xaml
@@ -9,18 +9,21 @@
       <Button ToolTip="{Binding LookFromTopToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding TopViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromTOP.png" Stretch="Uniform"/>
       </Button>
+      <Button ToolTip="{Binding LookFromBottomToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding BottomViewCommand}">
+         <Image Source="/Resources/GridViewPanel/LookFromBOTTOM.png" Stretch="Uniform"/>
+      </Button>
       <Button ToolTip="{Binding LookFromFrontToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding FrontViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromRightToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding RightViewCommand}">
-         <Image Source="/Resources/GridViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
-      </Button>
       <Button ToolTip="{Binding LookFromBackToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding BackViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromBACK.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding LookFromLeftToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding LeftViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
       </Button>
+      <Button ToolTip="{Binding LookFromRightToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding RightViewCommand}">
+         <Image Source="/Resources/GridViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
+      </Button>
       <Button ToolTip="{Binding LookFromIso_SWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSWCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
       </Button>
diff --git a/ViewPanel/ViewPanelVM.vb b/ViewPanel/ViewPanelVM.vb
index 8ff91a6..d7965ed 100644
--- a/ViewPanel/ViewPanelVM.vb
+++ b/ViewPanel/ViewPanelVM.vb
@@ -8,6 +8,7 @@ Public Class ViewPanelVM
    ' Definizione comandi
    Private m_cmdZoomAll As ICommand
    Private m_cmdTopView As ICommand
+   Private m_cmdBottomView As ICommand
    Private m_cmdFrontView As ICommand
    Private m_cmdLeftView As ICommand
    Private m_cmdBackView As ICommand
@@ -27,6 +28,11 @@ Public Class ViewPanelVM
          Return EgtMsg(MSG_GRIDVIEWPANEL + 7)
       End Get
    End Property
+   Public ReadOnly Property LookFromBottomToolTip As String
+      Get
+         Return EgtMsg(5284)
+      End Get
+   End Property
 
    Public ReadOnly Property LookFromFrontToolTip As String
       Get
@@ -110,6 +116,29 @@ Public Class ViewPanelVM
 
 #End Region ' TopViewCommand
 
+#Region "BottomViewCommand"
+
+   ''' <summary>
+   ''' Returns a command that do TopView.
+   ''' </summary>
+   Public ReadOnly Property BottomViewCommand As ICommand
+      Get
+         If m_cmdBottomView Is Nothing Then
+            m_cmdBottomView = New RelayCommand(AddressOf BottomView)
+         End If
+         Return m_cmdBottomView
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the BottomView.  This method is invoked by the BottomViewCommand.
+   ''' </summary>
+   Public Sub BottomView(ByVal param As Object)
+      Map.refProjectVM.GetScene.BottomView()
+   End Sub
+
+#End Region ' BottomViewCommand
+
 #Region "FrontViewCommand"
 
    ''' <summary>