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 @@
GridPanelView.xaml
+
+ MachGroupPanelView.xaml
+
+
PopUpGridPanelView.xaml
@@ -281,6 +285,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index 81c5dfa..ca453f7 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -31,6 +31,7 @@
+
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