From fbbd91f9ac5c8516fe00c363e494d2fe239a44ee Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 4 Jan 2017 07:41:11 +0000
Subject: [PATCH] EgtCAM5 : - migliorie varie per gestione visualizzazione.

---
 ProjectPage/DrawPanel/DrawPanelViewModel.vb     |  3 ++-
 ProjectPage/OptionPanel/OptionPanelViewModel.vb |  4 ++--
 ProjectPage/ProjectViewModel.vb                 | 10 ++++------
 ToolsDbWindow/ToolTreeView.vb                   | 11 ++++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ProjectPage/DrawPanel/DrawPanelViewModel.vb b/ProjectPage/DrawPanel/DrawPanelViewModel.vb
index 9902aba..bdc403d 100644
--- a/ProjectPage/DrawPanel/DrawPanelViewModel.vb
+++ b/ProjectPage/DrawPanel/DrawPanelViewModel.vb
@@ -270,7 +270,7 @@ Namespace EgtCAM5
          End Get
       End Property
       ' Definizione layer corrente
-      Private m_bSelOk As Boolean = (EgtGetFirstSelectedObj() <> GDB_ID.NULL)
+      Private m_bSelOk As Boolean = False
       Public ReadOnly Property bSelOk As Boolean
          Get
             Return m_bSelOk
@@ -835,6 +835,7 @@ Namespace EgtCAM5
       ''' Returns always true.
       ''' </summary>
       Private Function CanPlane(ByVal param As Object) As Boolean
+         If IniFile.m_ProjectSceneContext = 0 Then Return False
          m_bSelOk = EgtGetFirstSelectedObj() <> GDB_ID.NULL
          Return bLayerOk And bSelOk
       End Function
diff --git a/ProjectPage/OptionPanel/OptionPanelViewModel.vb b/ProjectPage/OptionPanel/OptionPanelViewModel.vb
index 6d2923f..a4daa6c 100644
--- a/ProjectPage/OptionPanel/OptionPanelViewModel.vb
+++ b/ProjectPage/OptionPanel/OptionPanelViewModel.vb
@@ -5,9 +5,9 @@ Namespace EgtCAM5
    Public Class OptionPanelViewModel
       Inherits ViewModelBase
 
-      Private m_DrawIsChecked As Boolean
+      Private m_DrawIsChecked As Boolean = True
 
-      Private m_MachiningIsChecked As Boolean
+      Private m_MachiningIsChecked As Boolean = False
 
       ' GRAPHICAL ELEMENTS
       Private m_OperationExpander As OperationExpanderView
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index 3286323..8fe1f28 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -11,8 +11,6 @@ Namespace EgtCAM5
 
 #Region "FIELDS"
 
-      Private m_CloseProgram As Boolean = False
-
       ' Variabili in cui salvo i filtri di selezione della modalità Draw e che poi ripristino all'uscita dalla modalità Machining
       Private m_bSelZeroDim As Boolean = True
       Private m_bSelCurve As Boolean = True
@@ -141,9 +139,8 @@ Namespace EgtCAM5
             MsgBox(EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
             ' Chiudo il programma
             Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATIONCOMMAND)
-            ' Verifico abilitazione prodotto
+         ' Verifico abilitazione prodotto
          ElseIf (IniFile.m_nKeyOptions And KEY_OPT.BASE) = 0 Then
-            m_CloseProgram = True
             MsgBox(EgtMsg(MSG_MISSINGKEYWD + 5), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
             ' Chiudo il programma
             Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATIONCOMMAND)
@@ -152,6 +149,8 @@ Namespace EgtCAM5
             PostInitializeScene()
             ' inizializzo gestore lavorazioni
             EgtInitMachMgr(IniFile.m_sMachinesRoot)
+            ' Apro progetto vuoto
+            Application.Msn.NotifyColleagues(Application.NEWPROJECT)
          End If
          ' Seleziono la macchina impostata nel file ini
          Application.Msn.NotifyColleagues(Application.LOADCURRENTMACHINE)
@@ -252,8 +251,6 @@ Namespace EgtCAM5
          Application.Msn.NotifyColleagues(Application.UPDATEOBJTREEOLDID, GDB_ID.NULL)
          ' nascondo input box
          Application.Msn.NotifyColleagues(Application.RESETINPUTBOX)
-         ' Apro progetto vuoto
-         Application.Msn.NotifyColleagues(Application.NEWPROJECT)
          ' Imposto stato filtro selezione
          m_ProjectScene.GetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
          m_Controller.MouseSetObjFilterForSelect(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
@@ -463,6 +460,7 @@ Namespace EgtCAM5
 
       Sub RegisterDrawPanelCommands()
          Application.Msn.Register(Application.GETCURRLAYER, Sub()
+                                                               If IniFile.m_ProjectSceneContext = 0 Then Return
                                                                Dim CurrLayer As Integer = m_Controller.GetCurrLayer()
                                                                Application.Msn.NotifyColleagues(Application.SETCURRLAYER, CurrLayer)
                                                             End Sub)
diff --git a/ToolsDbWindow/ToolTreeView.vb b/ToolsDbWindow/ToolTreeView.vb
index bf8b6cb..140739c 100644
--- a/ToolsDbWindow/ToolTreeView.vb
+++ b/ToolsDbWindow/ToolTreeView.vb
@@ -15,11 +15,12 @@ Public Class FamilyToolTreeViewItem
             m_IsSelected = value
             If value Then
                ' The function that I want to call When Parent item is selected in the tree
-               EgtSetCurrentContext(IniFile.m_ToolsDbSceneContext)
-               EgtNewFile()
-               EgtSetView(VT.TOP, False)
-               EgtZoom(ZM.ALL)
-               EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
+               If EgtSetCurrentContext(IniFile.m_ToolsDbSceneContext)
+                  EgtNewFile()
+                  EgtSetView(VT.TOP, False)
+                  EgtZoom(ZM.ALL)
+                  EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
+               End If
             End If
             NotifyPropertyChanged("IsSelected")
          End If