From 8aefba99c0ba648d1e3c7cfaca9dde67dca41f60 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Fri, 30 Sep 2016 09:52:01 +0000
Subject: [PATCH] EgtCAM5 : - Aggiunto MachGroupPanel.

---
 Application.xaml.vb                           |  3 ++
 EgtCAM5.vbproj                                |  8 ++++
 EgtCAM5Resources.xaml                         |  1 +
 .../MachGroupPanel/MachGroupPanelView.xaml    | 25 ++++++++++++
 .../MachGroupPanel/MachGroupPanelView.xaml.vb |  3 ++
 .../MachGroupPanel/MachGroupPanelViewModel.vb | 40 +++++++++++++++++++
 .../MachiningTreeExpanderViewModel.vb         |  2 +-
 ProjectPage/ProjectView.xaml                  |  7 +++-
 ProjectPage/ProjectView.xaml.vb               |  3 ++
 TopCommandBar/TopCommandBarViewModel.vb       |  1 +
 10 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 ProjectPage/MachGroupPanel/MachGroupPanelView.xaml
 create mode 100644 ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb
 create mode 100644 ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb

diff --git a/Application.xaml.vb b/Application.xaml.vb
index e1a488e..f88df09 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -164,6 +164,9 @@ Class Application
    Friend Const REMOVEMARKFROMLASTOPERATION As String = "RemoveMarkFromLastOperation"
    Friend Const SELECTEDOPERATION As String = "SelectedOperation"
 
+   ' MachiningGroupPanel
+   Friend Const LOADMACHGROUP As String = "LoadMachGroup"
+
    ' MachiningOptionPanel
    ' MachiningTreeViewExpander
    Friend Const MACHININGTREEVIEWEXPANDERISENABLED As String = "MachiningTreeViewExpanderIsEnabled"
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 789054e..1589104 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -162,6 +162,10 @@
       <DependentUpon>GridPanelView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectPage\GridPanel\GridPanelViewModel.vb" />
+    <Compile Include="ProjectPage\MachGroupPanel\MachGroupPanelView.xaml.vb">
+      <DependentUpon>MachGroupPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectPage\MachGroupPanel\MachGroupPanelViewModel.vb" />
     <Compile Include="ProjectPage\PopUpGridPanel\PopUpGridPanelView.xaml.vb">
       <DependentUpon>PopUpGridPanelView.xaml</DependentUpon>
     </Compile>
@@ -281,6 +285,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ProjectPage\MachGroupPanel\MachGroupPanelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProjectPage\PopUpGridPanel\PopUpGridPanelView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index 81c5dfa..ca453f7 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -31,6 +31,7 @@
    <ViewModel:InstrumentPanelViewModel x:Key="InstrumentPanelViewModel"/>
    <ViewModel:DbPanelViewModel x:Key="DbPanelViewModel"/>
    <ViewModel:ExecutePanelViewModel x:Key="ExecutePanelViewModel"/>
+   <ViewModel:MachGroupPanelViewModel x:Key="MachGroupPanelViewModel"/>
 
    <!-- 
   This template applies a StatusBarView to an instance 
diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml b/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml
new file mode 100644
index 0000000..15d171c
--- /dev/null
+++ b/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml
@@ -0,0 +1,25 @@
+<UserControl x:Class="MachGroupPanelView"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <UserControl.Resources>
+   </UserControl.Resources>
+   <StackPanel Orientation="Horizontal">
+      <ItemsControl ItemsSource="{Binding MachGroupList}">
+         <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+               <StackPanel Orientation="Horizontal"/>
+            </ItemsPanelTemplate>
+         </ItemsControl.ItemsPanel>
+         <ItemsControl.ItemTemplate>
+            <DataTemplate>
+               <Button Content="{Binding}" Height="30" MaxWidth="100" Padding="5,0,5,0" ToolTip="{Binding}"
+                  Command="{Binding SetCurrMachGroupCommand}" CommandParameter="{Binding}"/>
+            </DataTemplate>
+         </ItemsControl.ItemTemplate>
+      </ItemsControl>
+      <Button Content="+" Height="20" Width="20" VerticalAlignment="Center"
+         Margin="0,0,5,0" Command="{Binding AddMachGroup}" IsEnabled="False"/>
+   </StackPanel>
+
+</UserControl>
diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb b/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb
new file mode 100644
index 0000000..a2e979d
--- /dev/null
+++ b/ProjectPage/MachGroupPanel/MachGroupPanelView.xaml.vb
@@ -0,0 +1,3 @@
+Public Class MachGroupPanelView
+
+End Class
diff --git a/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb b/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb
new file mode 100644
index 0000000..e9971a8
--- /dev/null
+++ b/ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb
@@ -0,0 +1,40 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+
+Namespace EgtCAM5
+
+   Public Class MachGroupPanelViewModel
+      Inherits ViewModelBase
+
+      Private m_MachGroupList As New ObservableCollection(Of String)
+      Public Property MachGroupList As ObservableCollection(Of String)
+         Get
+            Return m_MachGroupList
+         End Get
+         Set(value As ObservableCollection(Of String))
+            If value IsNot m_MachGroupList Then
+               m_MachGroupList = value
+            End If
+         End Set
+      End Property
+
+      Private Sub LoadMachGroups()
+         ' Carico i gruppi di lavorazione nella lista
+         Dim nId = EgtGetFirstMachGroup()
+         While nId <> GDB_ID.NULL
+            Dim sName As String = String.Empty
+            EgtGetMachGroupName(nId, sName)
+            MachGroupList.Add(sName)
+            nId = EgtGetNextMachGroup(nId)
+         End While
+      End Sub
+
+      Sub New()
+         Application.Msn.Register(Application.LOADMACHGROUP, Sub()
+                                                                LoadMachGroups()
+                                                             End Sub)
+      End Sub
+
+   End Class
+
+End Namespace
\ No newline at end of file
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
index 56f7ef7..50596d9 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
@@ -83,7 +83,7 @@ Namespace EgtCAM5
          If TypeOf param Is MachiningTreeViewExpanderItem Then
             Dim Machining As MachiningTreeViewExpanderItem = DirectCast(param, MachiningTreeViewExpanderItem)
             ' Creo nuova lavorazione(operazione) con la lavorazione selezionata
-            Dim MachiningId As Integer = EgtAddMachining(MachiningTypeToString(DirectCast(Machining.Type, MCH_MY)) & "_1", Machining.Name)
+            Dim MachiningId As Integer = EgtAddMachining(Machining.Name & "_1", Machining.Name)
             ' Recupero geometria correntemente selezionata e la metto in un vettore
             Dim SelectedEntities As New List(Of Integer)
             Dim EntityId As Integer = EgtGetFirstSelectedObj()
diff --git a/ProjectPage/ProjectView.xaml b/ProjectPage/ProjectView.xaml
index 8cc1d11..10565d9 100644
--- a/ProjectPage/ProjectView.xaml
+++ b/ProjectPage/ProjectView.xaml
@@ -48,7 +48,6 @@
             <local:DoorsPanelView DataContext="{StaticResource DoorsPanelViewModel}"/>
          </EgtFloating:EgtFloatingPanel>
       </EgtFloating:EgtFloatingTray>
-      <EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom"/>
       <EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left">
          <EgtFloating:EgtFloatingPanel Name="DrawPanel" TitleBarOrientation="Vertical"
             IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
@@ -61,6 +60,12 @@
             <local:OptionPanelView DataContext="{StaticResource OptionPanelViewModel}"/>
          </EgtFloating:EgtFloatingPanel>
       </EgtFloating:EgtFloatingTray>
+      <EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
+         <EgtFloating:EgtFloatingPanel Name="MachGroupPanel"
+            IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+            <local:MachGroupPanelView DataContext="{StaticResource MachGroupPanelViewModel}"/>
+         </EgtFloating:EgtFloatingPanel>
+      </EgtFloating:EgtFloatingTray>
       <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
       <ContentControl Content="{Binding ProjectSceneHost}"/>
    </EgtFloating:EgtFloatingManager>
diff --git a/ProjectPage/ProjectView.xaml.vb b/ProjectPage/ProjectView.xaml.vb
index e8c4d0a..ff3aeac 100644
--- a/ProjectPage/ProjectView.xaml.vb
+++ b/ProjectPage/ProjectView.xaml.vb
@@ -15,6 +15,7 @@ Public Class ProjectView
       DoorsPanel.IsFloating = False
       DrawPanel.IsFloating = False
       OptionPanel.IsFloating = False
+      MachGroupPanel.IsFloating = False
       If GetPrivateProfileFloatingWinPos(S_GENERAL, "ShowPanel", sState, nIndex, nLeft, nTop) And Not String.IsNullOrEmpty(sState) Then
          PanelPositioning(ShowPanel, sState, nIndex, nLeft, nTop)
       End If
@@ -46,6 +47,7 @@ Public Class ProjectView
                                                                   DoorsPanel.Visibility = Visibility.Visible
                                                                   DrawPanel.Visibility = Visibility.Visible
                                                                   OptionPanel.Visibility = Visibility.Visible
+                                                                  MachGroupPanel.Visibility = Visibility.Collapsed
                                                                End Sub)
       Application.Msn.Register(Application.MACHININGMODE_ISCHECKED, Sub()
                                                                        ShowPanel.Visibility = Visibility.Visible
@@ -57,6 +59,7 @@ Public Class ProjectView
                                                                        DoorsPanel.Visibility = Visibility.Collapsed
                                                                        DrawPanel.Visibility = Visibility.Collapsed
                                                                        OptionPanel.Visibility = Visibility.Visible
+                                                                       MachGroupPanel.Visibility = Visibility.Visible
                                                                     End Sub)
    End Sub
 
diff --git a/TopCommandBar/TopCommandBarViewModel.vb b/TopCommandBar/TopCommandBarViewModel.vb
index fe2aab4..b19a945 100644
--- a/TopCommandBar/TopCommandBarViewModel.vb
+++ b/TopCommandBar/TopCommandBarViewModel.vb
@@ -99,6 +99,7 @@ Namespace EgtCAM5
             If value <> m_MachiningIsChecked Then
                m_MachiningIsChecked = value
                If value Then
+                  Application.Msn.NotifyColleagues(Application.LOADMACHGROUP)
                   Dim bOk As Boolean
                   Dim nId = EgtGetFirstMachGroup()
                   If nId <> GDB_ID.NULL Then