EgtCAM5 :

- Aggiunta possibilità di getire progressbar e output message presenti nella StatusBar da LUA.
- Inizio scrittura della struttura per MTables.
- Aggiunta la possibilità di aggiungere nuovi gruppi di lavorazione.
- Gestita uscita da NewMachiningCmd(in OperationList) con Esc.

ProjectPage/MachGroupPanel/MachGroupPanelView.xaml

@@ -24,7 +24,7 @@
          </ListBox.ItemContainerStyle>
          <ListBox.ItemTemplate>
             <DataTemplate>
-               <RadioButton Content="{Binding}" GroupName="MachiningGroups"
+               <RadioButton GroupName="MachiningGroups"
                   Height="30" MaxWidth="150" Margin="0,0,2,0" Padding="5,0,5,0" ToolTip="{Binding}"
                   Style="{StaticResource {x:Type ToggleButton}}"
                   Command="{Binding DataContext.SetCurrMachGroupCommand,
@@ -32,13 +32,18 @@
                                     AncestorType={x:Type UserControl}}}"
                   CommandParameter="{Binding}"
                   IsChecked="{Binding Path=IsSelected, RelativeSource={
-                  RelativeSource AncestorType={x:Type ListBoxItem}},Mode=TwoWay}"/>
+                  RelativeSource AncestorType={x:Type ListBoxItem}},Mode=TwoWay}">
+                  <RadioButton.Content>
+                     <TextBlock Text="{Binding}"/>
+                  </RadioButton.Content>
+                  
+               </RadioButton>
             </DataTemplate>
          </ListBox.ItemTemplate>
       </ListBox>
 
       <Button Content="+" Height="20" Width="20" VerticalAlignment="Center"
-         Margin="3,0,5,0" Command="{Binding AddMachGroupCommand}" IsEnabled="False"/>
+         Margin="3,0,5,0" Command="{Binding AddMachGroupCommand}"/>
       <Button Content="-" Height="20" Width="20" VerticalAlignment="Center"
          Margin="0,0,5,0" Command="{Binding RemoveMachGroupCommand}"/>
 

ProjectPage/MachGroupPanel/MachGroupPanelViewModel.vb

@@ -77,8 +77,9 @@ Namespace EgtCAM5
       End Sub
 
       Private Function AddNewMachGroup() As Boolean
-         Dim bOk As Boolean
-         bOk = (EgtAddMachGroup("Mach01") <> GDB_ID.NULL)
+         Dim sNewMachName As String = "Mach_1"
+         EgtGetMachGroupNewName(sNewMachName)
+         Dim bOk As Boolean = (EgtAddMachGroup(sNewMachName) <> GDB_ID.NULL)
          Dim sInitScriptPath As String = String.Empty
          EgtUILib.GetPrivateProfileString(S_DISPOSITION, K_INITSCRIPT, "", sInitScriptPath, IniFile.m_sCurrMachIniFilePath)
          If bOk And Not String.IsNullOrEmpty(sInitScriptPath) Then
@@ -133,10 +134,15 @@ Namespace EgtCAM5
       End Property
 
       Public Sub AddMachGroup()
-         AddNewMachGroup()
-         EgtDraw()
-         Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST, -1)
-         Application.Msn.NotifyColleagues(Application.UPDATECURRENTMACHINE)
+         If AddNewMachGroup() Then
+            Dim sMachName As String = String.Empty
+            EgtGetMachGroupName(EgtGetCurrMachGroup(), sMachName)
+            MachGroupList.Add(sMachName)
+            SelectedMachGroup = sMachName
+            EgtDraw()
+            Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST, -1)
+            Application.Msn.NotifyColleagues(Application.UPDATECURRENTMACHINE)
+         End If
       End Sub
 
 #End Region ' AddMachGroupCommand