Merge commit '4e947f293e849ceeef263f4cc6d65bd3278e4db0' into features/NewProjectGrid

ExecuteWindow/ExecuteWindowV.xaml

@@ -4,7 +4,7 @@
                             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                             Title="Execute Window" 
-                            Height="500" Width="400"
+                            Height="500" Width="600"
                             IsResizable="True"
                             IsMinimizable="False" 
                             WindowStartupLocation="CenterOwner" 
@@ -29,7 +29,8 @@
               Grid.ColumnSpan="2"
               Content="{Binding OkMsg}"
               Command="{Binding Ok_Command}"
-              Style="{StaticResource EgtCAM5_InputButton}"/>
+              Style="{StaticResource EgtCAM5_InputButton}"
+              Margin="0,5,0,10"/>
       <Button Grid.Column="1"
               Command="{Binding Reload_Command}"
               IsEnabled="{Binding bReload_IsEnable}"

OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb

@@ -95,16 +95,9 @@ Public Class MachiningTreeExpanderVM
             EgtRelocate(MachiningId, nSelectedOperationId, GDB_POS.AFTER)
          End If
          ' Imposto geometria da lavorare (tutta quella selezionata)
-         Dim vId(EgtGetSelectedObjCount() - 1) As Integer
-         Dim vSub(EgtGetSelectedObjCount() - 1) As Integer
-         Dim nInd As Integer = 0
-         Dim EntId As Integer = EgtGetFirstSelectedObj()
-         While EntId <> GDB_ID.NULL
-            vId(nInd) = EntId
-            SelData.GetSubFromId( EntId, vSub(nInd))
-            nInd += 1
-            EntId = EgtGetNextSelectedObj()
-         End While
+         Dim vId() As Integer = Nothing
+         Dim vSub() As Integer = Nothing
+         SelData.GetAllSelectedGeom(vId, vSub)
          EgtSetMachiningGeometry(vId, vSub)
          ' Calcolo la lavorazione con la nuova geometria
          EgtApplyMachining(True)

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -440,16 +440,9 @@ Public Class MachiningParameterExpanderVM
       m_CurrOperation.WriteOperationParam()
 
       ' Imposto geometria da lavorare (tutta quella selezionata)
-      Dim vId(EgtGetSelectedObjCount() - 1) As Integer
-      Dim vSub(EgtGetSelectedObjCount() - 1) As Integer
-      Dim nInd As Integer = 0
-      Dim EntId As Integer = EgtGetFirstSelectedObj()
-      While EntId <> GDB_ID.NULL
-         vId(nInd) = EntId
-         SelData.GetSubFromId(EntId, vSub(nInd))
-         nInd += 1
-         EntId = EgtGetNextSelectedObj()
-      End While
+      Dim vId() As Integer = Nothing
+      Dim vSub() As Integer = Nothing
+      SelData.GetAllSelectedGeom(vId, vSub)
       EgtSetMachiningGeometry(vId, vSub)
 
       ' Rigenero la lavorazione

Utility/Dictionary.xaml

@@ -794,6 +794,8 @@
    <Style x:Key="ExecuteWindow_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
       <Setter Property="AcceptsReturn" Value="True"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="FontFamily" Value="Consolas"/>
+      <Setter Property="FontSize" Value="12"/>
       <Setter Property="Margin" Value="5"/>
    </Style>
    

Utility/SelData.vb

@@ -122,6 +122,27 @@ Module SelData
       Return True
    End Function
 
+   Friend Function GetAllSelectedGeom(ByRef vId() As Integer, ByRef vSub() As Integer) As Boolean
+      If GetIdSubCount() > 0 then
+         VerifyIdSub()
+         GetAllIdSub(vId, vSub)
+      Else
+         Dim MyId(EgtGetSelectedObjCount() - 1) As Integer
+         Dim MySub(EgtGetSelectedObjCount() - 1) As Integer
+         Dim nInd As Integer = 0
+         Dim EntId As Integer = EgtGetFirstSelectedObj()
+         While EntId <> GDB_ID.NULL
+            MyId(nInd) = EntId
+            MySub(nInd) = -1
+            nInd += 1
+            EntId = EgtGetNextSelectedObj()
+         End While
+         vId = MyId
+         vSub = MySub
+      End If
+      Return True
+   End Function
+
    Friend Function GetSubFromId( nId As Integer, ByRef nSub As Integer) As Boolean
       For i As Integer = 0 To m_IdSub.Count() - 1
          If m_IdSub(i).m_nId = nId Then