From b6ecb870490ae87f8aa443654b52d062b2a273fc Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Tue, 19 Jul 2016 12:42:15 +0000
Subject: [PATCH] EgtCAM5 : - Migliorie varie.

---
 Constants/ConstIni.vb                         |  4 ++
 ProjectPage/DrawPanel/DrawPanelView.xaml      |  8 +--
 ProjectPage/DrawPanel/DrawPanelViewModel.vb   | 59 +++++++++++++++++++
 .../OperationExpanderView.xaml                |  6 +-
 .../OperationExpanderViewModel.vb             |  8 ++-
 ProjectPage/ProjectViewModel.vb               |  4 --
 6 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 5fe49fb..0505566 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -30,6 +30,10 @@ Module ConstIni
    Public Const K_LASTLUADIR As String = "LastLuaDir"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
    Public Const K_LASTEXPDIR As String = "LastExpDir"
+   Public Const K_DRAW2D As String = "2DDraw"
+   Public Const K_DRAW3D As String = "3DDraw"
+   Public Const K_MODIFY As String = "Modify"
+   Public Const K_TRANSFORM As String = "Transform"
 
    Public Const S_LUA As String = "Lua"
    Public Const K_LIBSDIR As String = "LibsDir"
diff --git a/ProjectPage/DrawPanel/DrawPanelView.xaml b/ProjectPage/DrawPanel/DrawPanelView.xaml
index 87d0dac..f447e78 100644
--- a/ProjectPage/DrawPanel/DrawPanelView.xaml
+++ b/ProjectPage/DrawPanel/DrawPanelView.xaml
@@ -9,7 +9,7 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Expander Header="2D Draw" Style="{StaticResource DrawPanelExpander}" Grid.Row="0">
+      <Expander Header="2D Draw" Style="{StaticResource DrawPanelExpander}" Grid.Row="0" IsExpanded="{Binding Draw2DIsExpanded}">
          <UniformGrid Columns="2">
             <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding PointCommand}">
                <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
@@ -55,7 +55,7 @@
             </Button>
          </UniformGrid>
       </Expander>
-      <Expander Header="3D Draw" Style="{StaticResource DrawPanelExpander}" Grid.Row="1">
+      <Expander Header="3D Draw" Style="{StaticResource DrawPanelExpander}" Grid.Row="1" IsExpanded="{Binding Draw3DIsExpanded}">
          <UniformGrid Columns="2">
             <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding PlaneCommand}">
                <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
@@ -84,7 +84,7 @@
 
          </UniformGrid>
       </Expander>
-      <Expander Header="Modify" Style="{StaticResource DrawPanelExpander}" Grid.Row="2">
+      <Expander Header="Modify" Style="{StaticResource DrawPanelExpander}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
          <UniformGrid Columns="2">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding DeleteCommand}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
@@ -128,7 +128,7 @@
 
          </UniformGrid>
       </Expander>
-      <Expander Header="Transform" Style="{StaticResource DrawPanelExpander}" Grid.Row="3">
+      <Expander Header="Transform" Style="{StaticResource DrawPanelExpander}" Grid.Row="3" IsExpanded="{Binding TransformIsExpanded}">
          <UniformGrid Columns="2">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding MoveCommand}">
                <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
diff --git a/ProjectPage/DrawPanel/DrawPanelViewModel.vb b/ProjectPage/DrawPanel/DrawPanelViewModel.vb
index 840af81..475acec 100644
--- a/ProjectPage/DrawPanel/DrawPanelViewModel.vb
+++ b/ProjectPage/DrawPanel/DrawPanelViewModel.vb
@@ -251,6 +251,48 @@ Namespace EgtCAM5
             Return m_bSelOk
          End Get
       End Property
+
+      ' Proprietà che permettono di aprire e chiudere gli expander
+      Private m_Draw2DIsExpanded As Boolean
+      Public Property Draw2DIsExpanded As Boolean
+         Get
+            Return m_Draw2DIsExpanded
+         End Get
+         Set(value As Boolean)
+            m_Draw2DIsExpanded = value
+         End Set
+      End Property
+
+      Private m_Draw3DIsExpanded As Boolean
+      Public Property Draw3DIsExpanded As Boolean
+         Get
+            Return m_Draw3DIsExpanded
+         End Get
+         Set(value As Boolean)
+            m_Draw3DIsExpanded = value
+         End Set
+      End Property
+
+      Private m_ModifyIsExpanded As Boolean
+      Public Property ModifyIsExpanded As Boolean
+         Get
+            Return m_ModifyIsExpanded
+         End Get
+         Set(value As Boolean)
+            m_ModifyIsExpanded = value
+         End Set
+      End Property
+
+      Private m_TransformIsExpanded As Boolean
+      Public Property TransformIsExpanded As Boolean
+         Get
+            Return m_TransformIsExpanded
+         End Get
+         Set(value As Boolean)
+            m_TransformIsExpanded = value
+         End Set
+      End Property
+
       ' Definizione comandi
       Private m_cmdPoint As ICommand
       Private m_cmdLine2P As ICommand
@@ -301,6 +343,23 @@ Namespace EgtCAM5
 #Region "CONSTRUCTOR"
 
       Sub New()
+         ' Leggo stato expander da file ini
+         Dim Draw2D = GetPrivateProfileInt(S_GENERAL, K_DRAW2D, 0)
+         Draw2DIsExpanded = If(Draw2D = 0, False, True)
+         Dim Draw3D = GetPrivateProfileInt(S_GENERAL, K_DRAW3D, 0)
+         Draw3DIsExpanded = If(Draw3D = 0, False, True)
+         Dim Modify = GetPrivateProfileInt(S_GENERAL, K_MODIFY, 0)
+         ModifyIsExpanded = If(Modify = 0, False, True)
+         Dim Transform = GetPrivateProfileInt(S_GENERAL, K_TRANSFORM, 0)
+         TransformIsExpanded = If(Transform = 0, False, True)
+
+         Application.Msn.Register(Application.CLOSEAPPLICATION, Sub()
+                                                                   WritePrivateProfileString(S_GENERAL, K_DRAW2D, If(m_Draw2DIsExpanded, "1", "0"))
+                                                                   WritePrivateProfileString(S_GENERAL, K_DRAW3D, If(m_Draw3DIsExpanded, "1", "0"))
+                                                                   WritePrivateProfileString(S_GENERAL, K_MODIFY, If(m_ModifyIsExpanded, "1", "0"))
+                                                                   WritePrivateProfileString(S_GENERAL, K_TRANSFORM, If(m_TransformIsExpanded, "1", "0"))
+                                                                End Sub)
+
          Application.Msn.Register(Application.SETCURRLAYER, Sub(CurrLayer As Integer)
                                                                m_CurrentLayer = CurrLayer
                                                             End Sub)
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
index ffb223a..4af0db3 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -35,8 +35,8 @@
                <Button Content="New Positioning" IsEnabled="False" Command="{Binding NewPositioningCommand}"  Height="40"/>
                <Button Content="Cancel Operation" Command="{Binding CancelOperationCommand}"  Height="40"/>
             </UniformGrid>
-            <ListBox IsSynchronizedWithCurrentItem="True" ItemsSource="{Binding OperationList,Mode=OneWay}" SelectedItem="{Binding SelectedOperation,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                     MaxHeight="200" x:Name="OperationList" IsEnabled="{Binding IsEnabledOperationList}">
+            <ListBox IsSynchronizedWithCurrentItem="True" ItemsSource="{Binding OperationList}" SelectedItem="{Binding SelectedOperation}"
+                     Height="200" x:Name="OperationList" IsEnabled="{Binding IsEnabledOperationList}">
                <ListBox.ItemTemplate>
                   <DataTemplate>
                      <Grid>
@@ -53,7 +53,7 @@
                </ListBox.ItemTemplate>
             </ListBox>
             <!--<UniformGrid Rows="1">
-               <Button Content="Move Up" Command="{Binding MoveUpCommand}"  Height="40"/>
+               <Button Content="Move Up" Command="{Binding MoveUpCommand}" CommandParameter="{Binding ElementName=OperationList,Path=SelectedItem}"  Height="40"/>
                <Button Content="Move Down" Command="{Binding MoveDownCommand}"  Height="40"/>
             </UniformGrid>-->
 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index 598ed8b..794f224 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -84,7 +84,8 @@ Namespace EgtCAM5
             Return m_SelectedOperation
          End Get
          Set(value As OperationListBoxItem)
-            If value IsNot m_SelectedOperation Then
+            'If value IsNot m_SelectedOperation Then
+            If Not IsNothing(value) Then
                ' Verifico se c'è l'operazione precedente 
                If m_LastMarkedOperationId <> GDB_ID.NULL Then
                   ' La deevidenzio 
@@ -118,8 +119,9 @@ Namespace EgtCAM5
                   ' Notifico l'operazione selezionata all'expander dei parametri operazione
                   Application.Msn.NotifyColleagues(Application.SELECTEDOPERATION, value)
                End If
-               m_SelectedOperation = value
             End If
+            m_SelectedOperation = value
+            'End If
             OnPropertyChanged("SelectedOperation")
          End Set
       End Property
@@ -499,7 +501,7 @@ Namespace EgtCAM5
             ' Ricarico la lista delle operazioni
             Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST)
             ' Riseleziono l'entità selezionata
-            Me.SelectedOperation = SelectedOperation
+            Me.SelectedOperation = DirectCast(param, OperationListBoxItem)
          End If
       End Sub
 
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index fa1ca4d..b66f699 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -77,10 +77,6 @@ Namespace EgtCAM5
          m_DrawOptionPanel = New BaseWindowView
          m_DrawOptionPanel.DataContext = New DrawOptionPanelViewModel
          WinPosToWindow(m_DrawOptionPanel, WinPos)
-         GetPrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-         m_DrawOptionPanel = New BaseWindowView
-         m_DrawOptionPanel.DataContext = New DrawOptionPanelViewModel
-         WinPosToWindow(m_DrawOptionPanel, WinPos)
          m_DrawOptionPanel.Show()
          ' Funzione che contiene la registrazione alle funzioni che permettono di visualizzare e nascondere le finestre di disegno
          ManagePanelVisibility()