From f9b9ec90cb0730290e22948c7b057c45b3aca77e Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 11 Jul 2016 19:46:52 +0000
Subject: [PATCH] EgtCAM5 : - Migliorie varie.

---
 Application.xaml.vb                           |  1 +
 .../ManageLayerExpanderView.xaml              |  6 +-
 ProjectPage/ProjectView.xaml                  | 16 +++--
 ProjectPage/ProjectView.xaml.vb               | 11 +--
 ProjectPage/ProjectViewModel.vb               | 71 +++++++++++++++----
 StatusBar/StatusBarView.xaml                  |  6 +-
 6 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/Application.xaml.vb b/Application.xaml.vb
index deceb19..763c54b 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -13,6 +13,7 @@ Class Application
       Dim MainWndViewModel As New MainWindowViewModel
       ' Assegno il ViewModel alla View
       MainWndView.DataContext = MainWndViewModel
+      Dim x = MainWndView.IsInitialized
       ' Mostro la View principale
       MainWndView.Show()
    End Sub
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
index e336a02..f369842 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="ManageLayerExpanderView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:local="clr-namespace:EgtCAM5">
    <Expander>
       <Expander.Header>
@@ -51,8 +51,8 @@
                </HierarchicalDataTemplate>
             </TreeView.Resources>
 
-            <!--Style dei nodi CathegoryItem che li riquadra di azzurro quando clicckati ed elimina l'ombra grigia -->
-            <!--che si presenta quando la categoria rimane vuota (ombra causata dal multibinding). -->
+            <!--Style dei nodi CathegoryItem che li riquadra di azzurro quando clicckati ed elimina l'ombra grigia 
+            che si presenta quando la categoria rimane vuota (ombra causata dal multibinding).--> 
             <TreeView.ItemContainerStyle>
                <Style TargetType="{x:Type TreeViewItem}">
                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
diff --git a/ProjectPage/ProjectView.xaml b/ProjectPage/ProjectView.xaml
index ea38875..d172d88 100644
--- a/ProjectPage/ProjectView.xaml
+++ b/ProjectPage/ProjectView.xaml
@@ -1,11 +1,13 @@
 <UserControl x:Class="ProjectView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtUILib="clr-namespace:EgtUILib;assembly=EgtUILib"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300" Loaded="UserControl_Loaded">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+                     
+   <interactivity:Interaction.Triggers>
+      <interactivity:EventTrigger EventName="Loaded">
+         <interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>
+      </interactivity:EventTrigger>
+   </interactivity:Interaction.Triggers>
 
    <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
    <ContentControl Content="{Binding ProjectSceneHost}"/>
diff --git a/ProjectPage/ProjectView.xaml.vb b/ProjectPage/ProjectView.xaml.vb
index 80bd19a..faf4386 100644
--- a/ProjectPage/ProjectView.xaml.vb
+++ b/ProjectPage/ProjectView.xaml.vb
@@ -1,12 +1,3 @@
-Imports EgtUILib
-
-Public Class ProjectView
-
-   Private Sub UserControl_Loaded(sender As Object, e As RoutedEventArgs)
-      ' Inizializzo la scena
-      'If Not ProjectScene.Init() Then
-      '   EgtOutLog("Errore nella creazione della scena")
-      'End If
-   End Sub
+Public Class ProjectView
 
 End Class
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index d4ff1ef..f470a8f 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -10,6 +10,8 @@ Namespace EgtCAM5
 
 #Region "FIELDS"
 
+      Private m_CloseProgram As Boolean = False
+
       'PROJECT PAGE'S PANELS
       Private m_GridViewPanel As BaseWindowView
       Private m_DrawPanel As BaseWindowView
@@ -26,21 +28,6 @@ Namespace EgtCAM5
          Get
             If m_bfirst Then
                SceneHost = New WindowsFormsHost() With {.Child = m_ProjectScene}
-               PreInitializeScene()
-               If Not m_ProjectScene.Init() Then
-                  EgtOutLog("Error in Project scene creation")
-                 ' Box di avviso
-                 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
-               ElseIf (IniFile.m_nKeyOptions And KEY_OPT.BASE) = 0 Then
-                  MsgBox(EgtMsg(MSG_MISSINGKEYWD + 5), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
-               End If
-               IniFile.m_ProjectSceneContext = m_ProjectScene.GetCtx
-               PostInitializeScene()
-               ' inizializzo gestore lavorazioni
-               EgtInitMachMgr(IniFile.m_sMachinesRoot)
                m_bfirst = False
             End If
             Return SceneHost
@@ -48,6 +35,8 @@ Namespace EgtCAM5
       End Property
       ' Scene controller
       Private WithEvents m_Controller As New Controller
+      ' Definizione comandi
+      Private m_cmdLoaded As ICommand
 
 #End Region
 
@@ -112,6 +101,58 @@ Namespace EgtCAM5
 
 #End Region
 
+#Region "COMMANDS"
+
+#Region "LoadedCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property LoadedCommand As ICommand
+         Get
+            If m_cmdLoaded Is Nothing Then
+               m_cmdLoaded = New RelayCommand(AddressOf Loaded, AddressOf CanLoaded)
+            End If
+            Return m_cmdLoaded
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub Loaded(ByVal param As Object)
+         PreInitializeScene()
+         If Not m_ProjectScene.Init() Then
+            EgtOutLog("Error in Project scene creation")
+            SceneHost.Child = Nothing
+            ' Box di avviso
+            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
+         ElseIf (IniFile.m_nKeyOptions And KEY_OPT.BASE) = 0 Then
+            m_CloseProgram = True
+            MsgBox(EgtMsg(MSG_MISSINGKEYWD + 5), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
+         Else
+            IniFile.m_ProjectSceneContext = m_ProjectScene.GetCtx
+            PostInitializeScene()
+            ' inizializzo gestore lavorazioni
+            EgtInitMachMgr(IniFile.m_sMachinesRoot)
+         End If
+
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanLoaded(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' LoadedCommand
+
+#End Region
+
 #Region "METHODS"
 
       Private Sub PreInitializeScene()
diff --git a/StatusBar/StatusBarView.xaml b/StatusBar/StatusBarView.xaml
index 732e6c8..d96a838 100644
--- a/StatusBar/StatusBarView.xaml
+++ b/StatusBar/StatusBarView.xaml
@@ -20,7 +20,6 @@
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
             </Grid>
@@ -53,10 +52,7 @@
          <Button Command="{Binding StatusUnitsCommand}" Content="{Binding StatusUnitsText}" Width="35"/>
       </StatusBarItem>
       <StatusBarItem Grid.Column="8">
-         <TextBlock/>
-      </StatusBarItem>
-      <StatusBarItem Grid.Column="9">
-         <TextBlock Width="20"/>
+         <ComboBox Height="20" Width="150"/>
       </StatusBarItem>
    </StatusBar>
 </UserControl>