From 2f3b5792e1e600e72ab6bdff398e8a1c9b868ef3 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Fri, 15 Jul 2016 09:01:32 +0000
Subject: [PATCH] EgtCAM5 : - Migliorie varie.

---
 Application.xaml.vb                              |  1 +
 .../DrawOptionPanel/DrawOptionPanelViewModel.vb  |  3 +++
 .../ManageLayerExpanderViewModel.vb              |  2 +-
 .../OperationExpanderViewModel.vb                | 16 +++++++++++++++-
 SharedFieldsClass.vb                             |  4 ++--
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Application.xaml.vb b/Application.xaml.vb
index 1685310..3a4c927 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -148,6 +148,7 @@ Class Application
    Friend Const SETINFOBOX As String = "SetInfoBox"
    Friend Const RIGHTCLICKEDLAYERTREEITEM As String = "RightClickedLayerTreeItem"
    Friend Const SAVEOBJECT As String = "SaveObject"
+   Friend Const REMOVEMARKFROMLASTOPERATION As String = "RemoveMarkFromLastOperation"
 
    ' StatusBar messages
    Friend Const STATUSGRIDCOMMAND As String = "StatusGridCommand"
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
index d33d8f6..6221bc6 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
@@ -43,6 +43,9 @@ Namespace EgtCAM5
                      EgtAddMachGroup("Mach01", "CMS-PF122R8RR")
                   End If
                   EgtZoom(ZM.ALL)
+               Else
+                  ' Deevidenzio l'ultima operazione evidenziata
+                  Application.Msn.NotifyColleagues(Application.REMOVEMARKFROMLASTOPERATION)
                End If
                OnPropertyChanged("ManageLayerExpander")
                OnPropertyChanged("InfoExpander")
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
index af6968e..5a9a902 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
@@ -73,7 +73,7 @@ Namespace EgtCAM5
 
       Sub New()
          'Imposto tempo di evidenziazione delle entità clickate
-         ObjTreeTimer.Interval = TimeSpan.FromMilliseconds(200)
+         ObjTreeTimer.Interval = TimeSpan.FromMilliseconds(1000)
          Application.Msn.Register(Application.LOADOBJTREE, Sub()
                                                               LoadObjTree()
                                                            End Sub)
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index 32c0b1c..22bbe30 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -6,6 +6,8 @@ Namespace EgtCAM5
    Public Class OperationExpanderViewModel
       Inherits ViewModelBase
 
+      ' Ultima lavorazione evidenziata
+      Private m_LastMarkedOperationId As Integer = GDB_ID.NULL
       Private m_IsExpanded As Boolean
       Public Property IsExpanded As Boolean
          Get
@@ -34,7 +36,15 @@ Namespace EgtCAM5
             Return m_SelectedOperation
          End Get
          Set(value As OperationListBoxItem)
-            m_SelectedOperation = value
+            If value IsNot m_SelectedOperation Then
+               If m_LastMarkedOperationId <> GDB_ID.NULL Then
+                  EgtResetMark(m_LastMarkedOperationId)
+               End If
+               EgtSetMark(value.Id)
+               m_LastMarkedOperationId = value.Id
+               EgtDraw()
+               m_SelectedOperation = value
+            End If
          End Set
       End Property
 
@@ -47,6 +57,10 @@ Namespace EgtCAM5
          Application.Msn.Register(Application.LOADOPERATIONLIST, Sub()
                                                                     LoadOperationList()
                                                                  End Sub)
+         Application.Msn.Register(Application.REMOVEMARKFROMLASTOPERATION, Sub()
+                                                                              EgtResetMark(m_LastMarkedOperationId)
+                                                                           End Sub)
+
       End Sub
 #Region "COMMANDS"
 
diff --git a/SharedFieldsClass.vb b/SharedFieldsClass.vb
index c54cb5c..9770340 100644
--- a/SharedFieldsClass.vb
+++ b/SharedFieldsClass.vb
@@ -345,8 +345,8 @@
       Drilling(45) = Visibility.Visible               ' DepthStr
       Drilling(46) = Visibility.Visible               ' UserNotes
       Drilling(47) = Visibility.Collapsed             ' OverLapStr
-      Drilling(48) = Visibility.Visible               ' OffsetStr
-      Drilling(49) = Visibility.Visible               ' SubType
+      Drilling(48) = Visibility.Collapsed             ' OffsetStr
+      Drilling(49) = Visibility.Collapsed             ' SubType
 
       ' Parametri Sawing
       Sawing(0) = Visibility.Visible                  ' Invert