-Gestione completa cambio tavola

- correzione inizializzazione lavorazioni compatibili con materiale e spessore.

CompoWindow/CompoWindowVM.vb

@@ -146,7 +146,7 @@ Public Class CompoWindowVM
 
    Friend Function MakePreview(ByRef sMsg As String) As Boolean
       If Not EgtLuaExecLine(LUA_CMP_DRAW & "(true)") Then
-         sMsg = "Error in component execution"
+         sMsg = EgtMsg(91689)   ' Error in component execution
          m_bDrawOk = False
       Else
          EgtLuaGetGlobStringVar(LUA_CMP_VARS & ".MSG", sMsg)

Constants/ConstGen.vb

@@ -21,6 +21,7 @@ Module ConstGen
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "OmagOFFICE.lic"
    Public Const S_LICENCE As String = "Licence"
+   Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
 
@@ -76,5 +77,7 @@ Module ConstGen
    Public Const SETUP_LUA As String = "SetUp.lua"
    ' Sottodirettorio per BackUp
    Public Const BACKUP_DIR As String = "BackUp"
+   ' Info per rotazione in registrazione grezzo
+   Public Const INFO_REGROT As String = "RegRot"
 
 End Module

Constants/ConstIni.vb

@@ -37,6 +37,7 @@ Module ConstIni
    Public Const K_CONTOURFROMCAMERA As String = "ContourFromCamera"
    Public Const K_SUPPORT As String = "Support"
    Public Const K_PHOTODIR As String = "PhotoDir"
+   Public Const K_SHOWNBARROW As String = "ShowNbArrow"
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
@@ -96,6 +97,7 @@ Module ConstIni
 
    Public Const S_SIDES As String = "Sides"
    Public Const K_MAXSIDEANGLE As String = "MaxSideAngle"
+   Public Const K_SIZEALWAYSONTOP As String = "SizeAlwaysOnTop"
    Public Const K_PARSIDE_AS_TRF As String = "ParSideAsTrf"
    Public Const K_SIDEANGLE As String = "SideAngle"
    Public Const K_DELTA_ANG_TG As String = "DeltaAngTg"
@@ -114,6 +116,7 @@ Module ConstIni
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
    Public Const K_FILOTOPROUNDOFF As String = "FiloTopRoundOff"
+   Public Const K_TEXTCOLORENT As String = "TextColorEnt"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"

CurrMachWindow/CurrMachWindowVM.vb

@@ -456,28 +456,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count = 0 Then
+               If m_CurrDrillingList.Count <= 1 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count = 0 Then
+               If m_CurrMillingList.Count <= 1 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count = 0 Then
+               If m_CurrPocketingList.Count <= 1 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count = 0 Then
+               If m_CurrWaterjettingList.Count <= 1 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
@@ -487,28 +487,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count = 0 Then
+               If m_CurrDrillingList.Count <= 1 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count = 0 Then
+               If m_CurrMillingList.Count <= 1 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count = 0 Then
+               If m_CurrPocketingList.Count <= 1 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count = 0 Then
+               If m_CurrWaterjettingList.Count <= 1 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)

DxfImportWindow/DxfImportSceneHostV.xaml.vb

@@ -112,7 +112,7 @@ Public Class DxfImportSceneHostV
 
    Private Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles ImportDxfScene.OnMouseDownScene
       ' Solo se in modalità angoli o gocciolatoio su lati esterni
-      If DxfImportWindowMap.refDxfImportWindowVM.SideAngle_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Drip_IsChecked Then
+      If DxfImportWindowMap.refDxfImportWindowVM.SideAngle_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Drip_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Engrave_IsChecked Then
          OnMouseDownSceneSideAngle(e)
       ElseIf DxfImportWindowMap.refDxfImportWindowVM.FiloTop_IsChecked Then
          OnMouseDownSceneFiloTop(e)

DxfImportWindow/DxfImportWindowV.xaml

@@ -6,7 +6,193 @@
    Title="{Binding TitleMsg}"
    IsMinimizable="False"
    ShowInTaskbar="False"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner">
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner"
+    xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+    
+    <EgtWPFLib5:EgtCustomWindow.Resources>
+        <!--gradiente colore-->
+               
+        <!--<Style x:Key="ScrollBarButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <theme:ScrollChrome x:Name="Chrome" RenderPressed="{TemplateBinding IsPressed}" RenderMouseOver="{TemplateBinding IsMouseOver}" SnapsToDevicePixels="true" theme:ScrollChrome.ScrollGlyph="{TemplateBinding theme:ScrollChrome.ScrollGlyph}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>-->
+        
+        <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Thumb}">
+                        <Border x:Name="Background" CornerRadius="0" Background="Transparent" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                            <Grid Background="Transparent"  Margin="1">
+                                <Border Opacity="0"  x:Name="BackgroundAnimation" Background="Transparent" />
+                                <Rectangle x:Name="BackgroundGradient" RadiusX="8" RadiusY="8" Fill="#FF095CA8" Stroke="#1C1D22" StrokeThickness="0.5">
+                                    <!--<Rectangle.Fill>
+                                        <LinearGradientBrush StartPoint=".7,0" EndPoint=".7,1">
+                                            <GradientStop Color="#1C1D22" Offset="0.375" />
+                                            <GradientStop Color="#1C1D22" Offset="0.625" />
+                                        </LinearGradientBrush>
+                                    </Rectangle.Fill>-->
+                                </Rectangle>
+                            </Grid>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        
+        <!--<Style x:Key="HorizontalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>-->
+        
+        <Style x:Key="VerticalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        
+        <Style x:Key="ScrollBarStyle1" TargetType="{x:Type ScrollBar}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+            <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="Width" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+            <Setter Property="MinWidth" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ScrollBar}">
+                        <Grid x:Name="Bg" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <Grid.RowDefinitions>
+                                <RowDefinition MaxHeight="1"/>
+                                <RowDefinition Height="0.00001*"/>
+                                <RowDefinition MaxHeight="1"/>
+                            </Grid.RowDefinitions>
+                            <!--<RepeatButton Command="{x:Static ScrollBar.LineUpCommand}" IsEnabled="{TemplateBinding IsMouseOver}" />-->
+                            <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="1">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                </Track.DecreaseRepeatButton>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb Style="{StaticResource ScrollBarThumb}"/>
+                                </Track.Thumb>
+                            </Track>
+                            <!--<RepeatButton Command="{x:Static ScrollBar.LineDownCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="2" theme:ScrollChrome.ScrollGlyph="DownArrow"/>-->
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Background" TargetName="Bg" Value="Transparent"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            
+            <!--<Style.Triggers>
+                <Trigger Property="Orientation" Value="Horizontal">
+                    <Setter Property="Width" Value="Auto"/>
+                    <Setter Property="MinWidth" Value="0"/>
+                    <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                    <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ScrollBar}">
+                                <Grid x:Name="Bg" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                        <ColumnDefinition Width="0.00001*"/>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                    </Grid.ColumnDefinitions>
+                                    <RepeatButton Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="{TemplateBinding IsMouseOver}" theme:ScrollChrome.ScrollGlyph="LeftArrow" Style="{StaticResource CustomScrollBarButton}"/>
+                                    <Track x:Name="PART_Track" Grid.Column="1" IsEnabled="{TemplateBinding IsMouseOver}">
+                                        <Track.DecreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource CustomScrollBarButton}"/>
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource CustomScrollBarButton}"/>
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb Style="{StaticResource ScrollBarThumb}"/>
+                                        </Track.Thumb>
+                                    </Track>
+                                    <RepeatButton Command="{x:Static ScrollBar.LineRightCommand}" Grid.Column="2" IsEnabled="{TemplateBinding IsMouseOver}" theme:ScrollChrome.ScrollGlyph="RightArrow" Style="{StaticResource CustomScrollBarButton}"/>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="Background" TargetName="Bg" Value="Transparent"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Trigger>
+            </Style.Triggers>-->
+        </Style>
+        
+        <Style x:Key="ScrollViewerStyle1" TargetType="{x:Type ScrollViewer}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                        <Grid x:Name="Grid" Background="{TemplateBinding Background}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Rectangle x:Name="Corner" Grid.Column="1" Fill="{StaticResource Omag_Black}" Grid.Row="1"/>
+                            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanHorizontallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" CanVerticallyScroll="False" Grid.Column="0" Content="{TemplateBinding Content}" CanContentScroll="{TemplateBinding CanContentScroll}" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
+                            <ScrollBar Style="{DynamicResource ScrollBarStyle1}" x:Name="PART_VerticalScrollBar" 
+                                       AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" 
+                                       Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" 
+                                       Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" 
+                                       Margin="2,0,0,0"/>
+                            <ScrollBar Style="{DynamicResource ScrollBarStyle1}" x:Name="PART_HorizontalScrollBar" 
+                                       AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" 
+                                       Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" 
+                                       Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="false">
+                    <Setter Property="Foreground" Value="{DynamicResource Omag_Blue}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </EgtWPFLib5:EgtCustomWindow.Resources>
 
     <DockPanel>
 
@@ -84,7 +270,7 @@
                 </UniformGrid>
             </GroupBox>
 
-            <UniformGrid Columns="4"
+            <UniformGrid Columns="5"
                    DockPanel.Dock="Top"
                    IsEnabled="{Binding SideEntity_IsEnabled}"
                    Margin="0,0,0,5">
@@ -98,6 +284,10 @@
                    IsChecked="{Binding FiloTop_IsChecked}"
                    Style="{StaticResource CompoWindow_WrapToggleButton}"/>
 
+                <ToggleButton Content="{Binding EngraveMsg}"
+                   IsChecked="{Binding Engrave_IsChecked}"
+                   Style="{StaticResource CompoWindow_WrapToggleButton}"/>
+                 
                 <!--Incidi da sotto-->
                 <ToggleButton Content="{Binding DripMsg}"
                       IsChecked="{Binding Drip_IsChecked}"
@@ -122,13 +312,12 @@
                     Style="{StaticResource OptionPanel_TextButton}"/>
             </UniformGrid>
 
-            <GroupBox Header="Dati pezzo"
-                      
+            <GroupBox Header="Dati pezzo"                     
                       BorderThickness="{StaticResource BorderGpBx_Thickness}"
                       Foreground="{StaticResource Omag_White}"
                       Margin="0">
-
-                <StackPanel>
+                <ScrollViewer Style="{DynamicResource ScrollViewerStyle1}" VerticalScrollBarVisibility="Auto" Focusable="False">
+                    <StackPanel>
                     <Grid Visibility="{Binding PartData_Visibility}"
                          Margin="0,0,0,10">
                         <Grid.ColumnDefinitions>
@@ -178,10 +367,12 @@
                                 TextWrapping="Wrap"
                                 TextAlignment="Center"
                                 Margin="0,0,0,20"/>
-
+                    
                     <ContentControl VerticalAlignment="Center"
-                         Content="{Binding SideEntityControl}"/>
+                         Content="{Binding SideEntityControl}" ScrollViewer.VerticalScrollBarVisibility="Visible"/>
+                    
                 </StackPanel>
+                </ScrollViewer>
             </GroupBox>
 
         </DockPanel>

DxfImportWindow/DxfImportWindowVM.vb

@@ -142,7 +142,7 @@ Public Class DxfImportWindowVM
          Return m_SideAngle_IsChecked
       End Get
       Set(value As Boolean)
-         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Then Return
+         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Or m_Engrave_IsChecked Then Return
          m_SideAngle_IsChecked = value
          If value Then
             ' Aggiungo regioni per percorsi interni
@@ -190,7 +190,7 @@ Public Class DxfImportWindowVM
          Return m_FiloTop_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_UnderDrill_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_Engrave_IsChecked Then Return
          m_FiloTop_IsChecked = value
          If value Then
             ' Aggiungo regioni per percorsi interni
@@ -233,13 +233,61 @@ Public Class DxfImportWindowVM
       End Set
    End Property
 
+   Private m_Engrave_IsChecked As Boolean
+   Public Property Engrave_IsChecked As Boolean
+      Get
+         Return m_Engrave_IsChecked
+      End Get
+      Set(value As Boolean)
+         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Or m_SideAngle_IsChecked Then Return
+         m_Engrave_IsChecked = value
+         If value Then
+            ' Aggiungo regioni per percorsi interni
+            AdjustSelectRegions()
+            ' Messaggio di selezione contorno
+            SetOutputMessage(EgtMsg(MSG_DRAWPAGEUC + 6), MSG_TYPE.INFO)     ' Selezionare un contorno
+            ' Imposto modalità sideangle
+            m_SideEntityControlVM = New SideEntityControlVM(SideEntityControlVM.CallingWindowOpt.DXFIMPORT,
+                                                            DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene,
+                                                            SideEntityControlVM.ModeOpt.ENGRAVE)
+            SideEntityControl = New SideEntityControlV(m_SideEntityControlVM)
+            Open_IsEnabled = False
+            Type_IsEnabled = False
+            Measure_IsEnabled = False
+            PartData_Visibility = Visibility.Collapsed
+            OrderList_Visibility = Visibility.Collapsed
+            OkIsEnabled = False
+         Else
+            ' Rimuovo regioni per percorsi interni
+            RemoveSelectRegions()
+            m_SideEntityControlVM.Close()
+            Open_IsEnabled = True
+            Type_IsEnabled = True
+            Measure_IsEnabled = True
+            PartData_Visibility = Visibility.Visible
+            OrderList_Visibility = Visibility.Visible
+            OkIsEnabled = True
+            m_SideEntityControlVM = Nothing
+            SideEntityControl = Nothing
+            ' Elimino scritte angoli per input e inserisco quelle definitive
+            SideEntityControlVM.WriteSideAngleForNest(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
+            ' Deseleziono tutto
+            DxfImportWindowMap.refDxfImportSceneHostV.Deselect()
+            ' Pulisco area messaggi
+            ClearOutputMessage()
+         End If
+         NotifyPropertyChanged("EngraveIsChecked")
+         EgtZoom(ZM.ALL)
+      End Set
+   End Property
+
    Private m_Drip_IsChecked As Boolean
    Public Property Drip_IsChecked As Boolean
       Get
          Return m_Drip_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Or m_Engrave_IsChecked Then Return
          m_Drip_IsChecked = value
          If value Then
             ' Messaggio di selezione contorno
@@ -283,7 +331,7 @@ Public Class DxfImportWindowVM
          Return m_UnderDrill_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_FiloTop_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_FiloTop_IsChecked Or m_Engrave_IsChecked Then Return
          m_UnderDrill_IsChecked = value
          If value Then
             ' Aggiungo regioni di selezione per percorsi interni
@@ -493,6 +541,12 @@ Public Class DxfImportWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property EngraveMsg As String
+      Get
+         Return EgtMsg(90397)
+      End Get
+   End Property
+
    Public ReadOnly Property DripMsg As String
       Get
          Return EgtMsg(MSG_IMPORTPAGEUC + 8)
@@ -646,9 +700,13 @@ Public Class DxfImportWindowVM
       Case FT.DXF
          ' recupero unità di misura del file
          Dim dScale As Double = If(m_MmIsChecked, ONEMM, ONEINCH)
-         ' Importo file DXF
-         If Not EgtImportDxf(m_sFilePath, dScale) Then Return False
-      Case FT.NGE
+            ' Importo file DXF
+            If Not EgtImportDxf(m_sFilePath, dScale) Then Return False
+            ' Riporto al piano tutte le superifici
+            EgtSelectAll()
+            EgtScale(GDB_ID.SEL, Frame3d.GLOB, 1, 1, 0)
+            EgtDeselectAll()
+         Case FT.NGE
          ' Carico Nge
          If Not EgtOpenFile(m_sFilePath) Then Return False
          ' Filtro Nge
@@ -840,7 +898,7 @@ Public Class DxfImportWindowVM
 
    Friend Sub SelectedPartChanged()
       ' Se sono in modalità inclinazioni o gocciolatoio calcolo lati inclinabili e creo testi
-      If SideAngle_IsChecked() Or Drip_IsChecked() Or FiloTop_IsChecked Then
+      If SideAngle_IsChecked() Or Drip_IsChecked() Or FiloTop_IsChecked Or Engrave_IsChecked Then
          m_SideEntityControlVM.ReLoadSideAnglePage(SideEntityControlVM.CallingWindowOpt.DXFIMPORT)
       End If
    End Sub

EgtStoneLib/CamAuto.vb

@@ -1,5 +1,6 @@
 Imports System.Security.Cryptography
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Friend Module CamAuto
 
@@ -25,9 +26,12 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.Add")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
+         OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91017), MSG_TYPE.WARNING)
       End If
       ResetOrderMachiningFlag()
       Return bOk
@@ -43,9 +47,34 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.AddWaterJet")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+         ' m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
+      End If
+      Return bOk
+   End Function
+
+   ' versione CamAuto 2.6l1: gestione tagli con ridotto affondamento
+   Friend Function AddWaterJetMachining(LocaList As List(Of Integer), ByRef nWarn As Integer) As Boolean
+      EgtLuaCreateGlobTable("CAM")
+      SetLuaStandardCamParams()
+      For i As Integer = 0 To LocaList.Count - 1
+         EgtLuaSetGlobIntVar("CAM.TAB_OPERID." & (i + 1).ToString, LocaList(i))
+      Next
+      Dim nErr As Integer = 999
+      Dim bOk As Boolean = EgtLuaExecFile(m_sCamAutoDir & "\CamAuto.lua")
+      bOk = bOk AndAlso EgtLuaGetGlobIntVar("CAM.ERR", nErr) AndAlso nErr = 0
+      bOk = bOk AndAlso EgtLuaCallFunction("CAM.AddWaterJets")
+      EgtLuaGetGlobIntVar("CAM.ERR", nErr)
+      EgtLuaResetGlobVar("CAM")
+      If nErr > 0 Then
+         bOk = False
+         EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
       End If
       Return bOk
    End Function
@@ -59,9 +88,11 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.Erase")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
       End If
       ResetOrderMachiningFlag()
       Return bOk
@@ -76,9 +107,11 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.InvertVerticalCut")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
       End If
       Return bOk
    End Function
@@ -89,6 +122,7 @@ Friend Module CamAuto
    End Function
 
    Friend Function ResetAllMachinings(ByRef nWarn As Integer) As Boolean
+      EgtOutLog(" ++ ReserAllMachining ++ ")
       ' Cancello tutte le lavorazioni
       EraseMachinings(GDB_ID.NULL)
       ' Reinserisco tutte le lavorazioni piane (non sono previste le lavorazioni delle cornici)
@@ -273,9 +307,11 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.UpdateAllTp")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
       End If
       Return bOk
    End Function
@@ -289,9 +325,11 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.Sort")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
       End If
       Return bOk
    End Function
@@ -306,9 +344,11 @@ Friend Module CamAuto
       bOk = bOk AndAlso EgtLuaCallFunction("CAM.SpecApplyDisp")
       EgtLuaGetGlobIntVar("CAM.ERR", nErr)
       EgtLuaResetGlobVar("CAM")
-      If nErr <> 0 Then
+      If nErr > 0 Then
          bOk = False
          EgtOutLog("Error in CamAuto : " & nErr.ToString())
+      ElseIf nErr < 0 Then
+         EgtOutLog("Warning in CamAuto : " & nErr.ToString())
       End If
       If ResetOrderMachiningFlag() Then
          ResetOrderMachiningFlag()
@@ -451,6 +491,7 @@ Friend Module CamAuto
       Return EgtRemoveOperationHome(nId)
    End Function
 
+   ' DA AGGIORNARE PER CAMBIO UTENSILE LAMA
    Friend Function VerifySetup(ByRef sMissingTools As String) As Boolean
       Dim bOk As Boolean = True
       Dim bIsMultiCut = (EgtGetHeadId("H101") <> GDB_ID.NULL)
@@ -545,6 +586,7 @@ Friend Module CamAuto
       Dim dReducedDepth As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_REDUCEDDEPTH, 1, CurrentMachine.sMachIniFile)
       ' Ciclo sulle lavorazioni
       Dim nOperId As Integer = EgtGetFirstOperation()
+      Dim LocalListOperId As New List(Of Integer)
       While nOperId <> GDB_ID.NULL
          ' verifico sia una lavorazione valida di taglio con lama
          If IsValidMachining(nOperId) And EgtGetOperationType(nOperId) = MCH_OY.SAWING Then
@@ -559,12 +601,14 @@ Friend Module CamAuto
                ' se abilitato e attivo waterjet, lo aggiungo per completare il taglio
                If CurrentMachine.WaterJettingActive Then
                   Dim nWarn As Integer = 0
-                  AddWaterJetMachining(nOperId, nWarn)
+                  LocalListOperId.Add(nOperId)
+                  'AddWaterJetMachining(nOperId, nWarn)
                End If
             End If
          End If
          nOperId = EgtGetNextOperation(nOperId)
       End While
+      If LocalListOperId.Count > 0 Then AddWaterJetMachining(LocalListOperId, 0)
       Return bModified
    End Function
 
@@ -859,6 +903,7 @@ Friend Module CamAuto
    Private Function SetLuaStandardCamParams(Optional bDripOk As Boolean = True) As Boolean
       Dim sMaterial As String = CurrentMachine.CurrMat.sName
       Dim sSawMch As String = CurrentMachine.sCurrSawing
+      Dim sSawTiltedMch As String = CurrentMachine.sCurrSawingTilted
       Dim sMillMch As String = CurrentMachine.sCurrMilling
       Dim sDrillMch As String = CurrentMachine.sCurrDrilling
       Dim sWaterJetMch As String = CurrentMachine.sCurrWaterJetting
@@ -876,6 +921,7 @@ Friend Module CamAuto
       Dim dMillingShort As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, CurrentMachine.sMachIniFile)
       EgtLuaSetGlobStringVar("CAM.MATERIAL", sMaterial)
       EgtLuaSetGlobStringVar("CAM.SAWMCH", sSawMch)
+      EgtLuaSetGlobStringVar("CAM.SAWTILTEDMCH", sSawTiltedMch)
       EgtLuaSetGlobStringVar("CAM.MILLMCH", sMillMch)
       EgtLuaSetGlobStringVar("CAM.DRILLMCH", sDrillMch)
       EgtLuaSetGlobStringVar("CAM.WATERJETMCH", sWaterJetMch)
@@ -896,24 +942,29 @@ Friend Module CamAuto
       Return True
    End Function
 
+   ' ver. 2.7f1 
    Friend Function GetTableCount() As Integer
       If EgtGetTableId(MAIN_TAB) = GDB_ID.NULL Then Return 0
       If EgtGetTableId(SECOND_TAB) = GDB_ID.NULL Then Return 1
       If EgtGetTableId(THIRD_TAB) = GDB_ID.NULL Then Return 2
-      Return 3
+      If EgtGetTableId(FORTH_TAB) = GDB_ID.NULL Then Return 3
+      Return 4
    End Function
 
    Friend Function GetTableName(nInd As Integer) As String
       If nInd = 1 Then Return MAIN_TAB
       If nInd = 2 Then Return SECOND_TAB
       If nInd = 3 Then Return THIRD_TAB
+      If nInd = 4 Then Return FORTH_TAB
       Return ""
    End Function
 
    Friend Function GetCurrentTable() As Integer
       Dim sTabName As String = MAIN_TAB
       EgtGetTableName(sTabName)
-      If sTabName = THIRD_TAB Then
+      If sTabName = FORTH_TAB Then
+         Return 4
+      ElseIf sTabName = THIRD_TAB Then
          Return 3
       ElseIf sTabName = SECOND_TAB Then
          Return 2
@@ -1393,4 +1444,14 @@ Friend Module CamAuto
       Return EgtApplyMachining(False)
    End Function
 
+   Friend Function GetRegistrationRotation() As Double
+      Dim dRegRot As Double = 0
+      EgtGetInfo(GetCurrentRaw(), INFO_REGROT, dRegRot)
+      Return dRegRot
+   End Function
+
+   Friend Function SetRegistrationRotation(dRegRot As Double) As Boolean
+      Return EgtSetInfo(GetCurrentRaw(), INFO_REGROT, dRegRot)
+   End Function
+
 End Module

EgtStoneLib/ConstMach.vb

@@ -48,6 +48,7 @@ Module ConstMach
    Public Const MAIN_TAB As String = "MainTab"
    Public Const SECOND_TAB As String = "2ndTab"
    Public Const THIRD_TAB As String = "3rdTab"
+   Public Const FORTH_TAB As String = "4thTab"
    ' Nome tavola ausiliaria per spostamento finale pezzi
    Public Const AUX_TAB As String = "AuxTab"
 
@@ -166,6 +167,7 @@ Module ConstMach
    ' Info in entità da tagliare per affondamento
    Public Const INFO_DEPTH As String = "Depth"
    Public Const INFO_DEPTH2 As String = "Depth2"
+   Public Const INFO_AGG2 As String = "Agg2"
    Public Const INFO_WIDTH As String = "Width"
    ' Info in entità da tagliare per taglio ristretto
    Public Const INFO_STRICT As String = "Strict"

EgtStoneLib/ConstMachIni.vb

@@ -122,6 +122,7 @@
    Public Const K_TAB2_ADDITIONALTABLE As String = "Tab2AdditionalTable"
    Public Const K_TAB3_ADDITIONALTABLE As String = "Tab3AdditionalTable"
    Public Const K_CENTER_RAW_ONX As String = "CenterRawOnX"
+   Public Const K_CHANGETABWD As String = "ChangeTabWD"
 
    Public Const S_PHOTO As String = "Photo"
    Public Const K_PHOTO_OFFSETX As String = "OffsetX"
@@ -240,6 +241,7 @@
 
    Public Const S_MACH_MACH As String = "Mach"
    Public Const K_CURRSAW As String = "CurrSaw"
+   Public Const K_CURRSAWTILTED As String = "CurrSawTilted"
    Public Const K_CURRDRILL As String = "CurrDrill"
    Public Const K_CURRMILL As String = "CurrMill"
    Public Const K_CURRMILLNOTIP As String = "CurrMillNoTip"
@@ -247,6 +249,7 @@
    Public Const K_CURRDRIPDRILL As String = "CurrDripDrill"
    Public Const K_CURRWATERJET As String = "CurrWaterJet"
    Public Const K_CURRSAWING As String = "CurrSawing"
+   Public Const K_CURRSAWINGTILTED As String = "CurrSawingTilted"
    Public Const K_CURRSAWING_OFFICE As String = "CurrOfficeSawing"
    Public Const K_CURRDRILLING As String = "CurrDrilling"
    Public Const K_CURRDRILLING_OFFICE As String = "CurrOfficeDrilling"

EgtStoneLib/CurrentMachine.vb

@@ -107,6 +107,7 @@ Public Module CurrentMachine
 
    ' Variabili che contengono il nome degli utensili disponibili per tipo
    Private m_sCurrSaw As String = String.Empty
+   Private m_sCurrSawTilted As String = String.Empty
    Private m_sCurrDrill As String = String.Empty
    Private m_sCurrMill As String = String.Empty
    Private m_sCurrMillNoTip As String = String.Empty
@@ -116,6 +117,7 @@ Public Module CurrentMachine
 
    ' Variabili che contengono le lavorazioni correntemente attive (utilizzate per definire lavorazioni nel programma)
    Private m_sCurrSawing As String = String.Empty
+   Private m_sCurrSawingTilted As String = String.Empty
    Private m_sCurrDrilling As String = String.Empty
    Private m_sCurrMilling As String = String.Empty
    Private m_sCurrPocketing As String = String.Empty
@@ -731,6 +733,18 @@ Friend Property sCurrMillNoTip As String
       End Set
    End Property
 
+   Friend Property sCurrSawingTilted As String
+      Get
+         Return m_sCurrSawingTilted
+      End Get
+      Set(value As String)
+         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWINGTILTED, value, sMachIniFile) Then
+            m_sCurrSawingTilted = value
+            'm_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
+         End If
+      End Set
+   End Property
+
    Friend Property sCurrDrilling As String
       Get
          Return m_sCurrDrilling
@@ -1270,6 +1284,13 @@ Friend Property sCurrMillNoTip As String
       ' Leggo utensili correnti
       ' lama
       GetPrivateProfileString(S_MACH_MACH, K_CURRSAW, Nothing, m_sCurrSaw, sMachIniFile)
+      ' lama inclinata
+      If m_nShowToolChanger = 4 Then
+         GetPrivateProfileString(S_MACH_MACH, K_CURRSAWTILTED, Nothing, m_sCurrSawTilted, sMachIniFile)
+      Else
+         ' se non è configurato il cambio utensile e allora imposto l'unica lama disponibile per i tagli inclinati
+         m_sCurrSawTilted = m_sCurrSaw
+      End If
       ' foretto
       GetPrivateProfileString(S_MACH_MACH, K_CURRDRILL, Nothing, m_sCurrDrill, sMachIniFile)
       ' fresa
@@ -1286,6 +1307,8 @@ Friend Property sCurrMillNoTip As String
       ' Leggo lavorazioni correnti
       ' lama
       m_sCurrSawing = EstCalc.GetCurrSawing()
+      ' lama inlicnata
+      m_sCurrSawingTilted = EstCalc.GetCurrSawingTilted()
       ' foretto
       m_sCurrDrilling = EstCalc.GetCurrDrilling()
       ' fresa

EgtStoneLib/EstCalc.vb

@@ -258,6 +258,14 @@ Module EstCalc
       Return sCurrSawing
    End Function
 
+   Friend Function GetCurrSawingTilted() As String
+      Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
+      If nOperId = GDB_ID.NULL Then Return ""
+      Dim sCurrSawing As String = String.Empty
+      EgtGetInfo(nOperId, INFO_CURRSAWING, sCurrSawing)
+      Return sCurrSawing
+   End Function
+
    Friend Function SetCurrMilling(sCurrMilling As String) As Boolean
       Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
       If nOperId = GDB_ID.NULL Then Return False
@@ -332,7 +340,7 @@ Module EstCalc
       Return (nFlag <> 0)
    End Function
 
-   Public Function AdjustAdditionalTable() As Boolean
+   Public Function AdjustAdditionalTable(Optional bForced As Boolean = False) As Boolean
       ' Recupero altezza sottotavola corrente
       Dim nFixtId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), MACH_FIXT_GROUP)
       Dim nAddTabId As Integer = EgtGetFirstNameInGroup(nFixtId, MACH_ADD_TABLE)
@@ -343,18 +351,27 @@ Module EstCalc
          dCurrAddTab = b3AddTab.DimZ()
       End If
       ' Se valore cambiato, aggiorno...
-      Dim dDeltaZ As Double = dAdditionalTable - dCurrAddTab
-      If Math.Abs(dDeltaZ) > EPS_SMALL Then
+      Dim dDeltaZ As Double = CurrentMachine.dAdditionalTable - dCurrAddTab
+      Dim bChanged As Boolean = (Math.Abs(dDeltaZ) > EPS_SMALL)
+      If bChanged Or bForced Then
+         Dim bOldEnMod As Boolean = EgtGetEnableModified()
+         If Not bChanged AndAlso bOldEnMod Then EgtDisableModified()
          AddAdditionalTable()
          UpdateAllRawsZ(dDeltaZ)
-         ' !!!  FOTO DA GESTIRE  !!!
-         'If GetPhoto() <> GDB_ID.NULL Then
-         '   UpdatePhoto()
-         '   UpdateContour()
-         '   If EgtGetRawPartCount() > 0 Then
-         '      ShowPhoto(False)
-         '   End If
-         'End If
+         If GetPhoto() <> GDB_ID.NULL Then
+            UpdatePhoto()
+            UpdateContour()
+            If EgtGetRawPartCount() > 0 Then
+               ShowPhoto(False)
+               Dim nRawGrpId As Integer = EgtGetFirstRawPart()
+               While nRawGrpId <> GDB_ID.NULL
+                  Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawGrpId, NAME_RAW_SOLID)
+                  If nRawSolidId <> GDB_ID.NULL Then EgtSetTextureName(nRawSolidId, PHOTO_NAME)
+                  nRawGrpId = EgtGetNextRawPart(nRawGrpId)
+               End While
+            End If
+         End If
+         If Not bChanged AndAlso bOldEnMod Then EgtEnableModified()
       End If
       Return True
    End Function
@@ -726,49 +743,65 @@ Module EstCalc
          nLayId = EgtGetNextName(nLayId, NAME_INLOOP)
       End While
       ' Aggiorno le entità con tallone e quelle con angolo esterno
-      Const AGG_DEPTH As Double = 2.0
+      Const AGG_DEPTH As Double = 0.75
+      Dim bSizeOnTop As Boolean = (GetMainPrivateProfileInt(S_SIDES, K_SIZEALWAYSONTOP, 0) <> 0)
       For Each nEnt As Integer In vEnt
          ' Se aggiornamento vietato, vado oltre
-         If EgtExistsInfo( nEnt, INFO_SIDE_FIXED) Then continue for
+         If EgtExistsInfo(nEnt, INFO_SIDE_FIXED) Then Continue For
          ' Recupero eventuali tallone ed angolo originale
          Dim dHeel As Double = 0
          Dim dSideAng As Double = 0
          EgtGetInfo(nEnt, INFO_HEEL, dHeel)
          EgtGetInfo(nEnt, INFO_ORIG_SIDE_ANGLE, dSideAng)
+         ' Se inclinazione con tallone
          If Math.Abs(dSideAng) > EPS_ANG_SMALL And dHeel > 10 * EPS_SMALL Then
-            ' Angolo esterno
+            ' Inclinazione esterna
             If dSideAng > 0 Then
                ' Se tallone inferiore a spessore
                If dHeel < dTh - 10 * EPS_SMALL Then
                   EgtSetInfo(nEnt, INFO_SIDE_ANGLE, 0.0)
                   EgtSetInfo(nEnt, INFO_SIDE_ANGLE2, dSideAng)
-                  EgtSetInfo(nEnt, INFO_OFFSET2, -(dTh - dHeel) * Math.Tan(dSideAng * Math.PI / 180))
+                  If Not bSizeOnTop Then
+                     EgtSetInfo(nEnt, INFO_OFFSET, 0)
+                     EgtSetInfo(nEnt, INFO_OFFSET2, -(dTh - dHeel) * Math.Tan(dSideAng * Math.PI / 180))
+                  Else
+                     EgtSetInfo(nEnt, INFO_OFFSET, (dTh - dHeel) * Math.Tan(dSideAng * Math.PI / 180))
+                     EgtSetInfo(nEnt, INFO_OFFSET2, 0)
+                  End If
                   EgtSetInfo(nEnt, INFO_DEPTH2, (dTh - dHeel) + AGG_DEPTH)
-               ' altrimenti, tallone superiore a spessore -> non c'è taglio inclinato
+                  EgtSetInfo(nEnt, INFO_AGG2, AGG_DEPTH)
+                  ' altrimenti, tallone superiore a spessore -> non c'è taglio inclinato
                Else
                   EgtSetInfo(nEnt, INFO_SIDE_ANGLE, 0.0)
                   EgtSetInfo(nEnt, INFO_SIDE_ANGLE2, 0.0)
                   EgtRemoveInfo(nEnt, INFO_OFFSET2)
                   EgtRemoveInfo(nEnt, INFO_DEPTH2)
+                  EgtRemoveInfo(nEnt, INFO_AGG2)
                End If
-            ' Angolo interno
+               ' Inclinazione interna
             Else
                ' Se tallone inferiore a spessore
                If dHeel < dTh - 10 * EPS_SMALL Then
                   EgtSetInfo(nEnt, INFO_OFFSET, dHeel * Math.Tan(-dSideAng * Math.PI / 180))
                   EgtSetInfo(nEnt, INFO_SIDE_ANGLE2, 0.0)
                   EgtSetInfo(nEnt, INFO_DEPTH2, dHeel + AGG_DEPTH)
-               ' altrimenti, tallone superiore a spessore -> non c'è taglio inclinato
+                  EgtSetInfo(nEnt, INFO_AGG2, AGG_DEPTH)
+                  ' altrimenti, tallone superiore a spessore -> non c'è taglio inclinato
                Else
                   EgtSetInfo(nEnt, INFO_SIDE_ANGLE, 0.0)
                   EgtRemoveInfo(nEnt, INFO_OFFSET)
                   EgtRemoveInfo(nEnt, INFO_SIDE_ANGLE2)
                   EgtRemoveInfo(nEnt, INFO_DEPTH2)
+                  EgtRemoveInfo(nEnt, INFO_AGG2)
                End If
             End If
-         ' Se altrimenti inclinazione esterna
+            ' Se altrimenti inclinazione esterna
          ElseIf dSideAng > EPS_ANG_SMALL Then
-            EgtSetInfo(nEnt, INFO_OFFSET, -dTh * Math.Tan(dSideAng * Math.PI / 180))
+            If Not bSizeOnTop Then
+               EgtSetInfo(nEnt, INFO_OFFSET, -dTh * Math.Tan(dSideAng * Math.PI / 180))
+            Else
+               EgtSetInfo(nEnt, INFO_OFFSET, 0)
+            End If
          End If
       Next
       Return True
@@ -990,8 +1023,22 @@ Module EstCalc
       Const STORE_DIST As Double = 200
       ' 40 il Font usato per indicare il numero di pezzi in parcheggio "# N"
       Const STORE_OFFS As Double = 20 + 40 + 20
-      Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (STORE_LARGH - b3Tab.DimX())
-      Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + STORE_LARGH, b3Tab.Min().y - STORE_DIST, STORE_OFFS, False)
+      Dim dStoreLarg As Double = GetPrivateProfileDouble("Store", "StoreLargh", STORE_LARGH, CurrentMachine.sMachIniFile)
+      Dim dStoreDist As Double = GetPrivateProfileDouble("Store", "StoreDist", STORE_DIST, CurrentMachine.sMachIniFile)
+      Dim dStoreOffs As Double = GetPrivateProfileDouble("Store", "StoreOffs", STORE_OFFS, CurrentMachine.sMachIniFile)
+      Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (dStoreLarg - b3Tab.DimX())
+
+      ' Verifico che il pezzo ha una posizione salvata
+      Dim ptCenter As Point3d
+      If EgtGetInfo(nId, "PosInPark", ptCenter) Then
+         Dim ptCurrPos As Point3d
+         EgtCenterPoint(nId, GDB_ID.ROOT, ptCurrPos)
+         Dim vt As New Vector3d(ptCenter - ptCurrPos)
+         EgtMove(nId, vt, GDB_RT.GLOB)
+         Return True
+      End If
+
+      Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + dStoreLarg, b3Tab.Min().y - dStoreDist, dStoreOffs, False)
    End Function
 
    Friend Function VerifyPartsNesting(bReducedCut As Boolean) As Boolean

EgtStoneLib/VeinMatchingWindow.xaml

@@ -1,7 +1,7 @@
 <Window x:Class="VeinMatchingWindow"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   Height="500" Width="500" ShowInTaskbar="False" Initialized="Window_Initialized" MinWidth="300" MinHeight="300">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Height="500" Width="500" ShowInTaskbar="False" Initialized="Window_Initialized" MinWidth="300" MinHeight="300">
 
    <Grid Name="VeinMatchingGrid" Background="{StaticResource Omag_Gray}">
       <Grid.ColumnDefinitions>
@@ -11,21 +11,16 @@
 
       <StackPanel Orientation="Vertical">
          <ToggleButton Name="ShowTextBtn" Height="40" Width="80"
-                       Margin="0,5,0,0"
-                       Content="ShowText"/>
+                       Margin="0,5,0,0"/>
          <ToggleButton Name="EditBtn" Height="40" Width="80"
-                       Margin="0,5,0,0"
-                       Content="Edit"/>
+                       Margin="0,5,0,0"/>
          <ToggleButton Name="VerifyBtn" Height="40" Width="80"
-                       Margin="0,5,0,0"
-                       Content="Verify"/>
+                       Margin="0,5,0,0"/>
          <ToggleButton Name="MagneticBtn" Height="40" Width="80"
                        Visibility="Collapsed"
-                       Margin="0,5,0,0"
-                       Content="Magnetic"/>
+                       Margin="0,5,0,0"/>
          <Button Name="ExportBtn" Height="40" Width="80"
-                 Margin="0,5,0,0"
-                 Content="Export"/>
+                 Margin="0,5,0,0"/>
          <Button Name="AssemblyBtn" Height="40" Width="80"
                  Margin="0,5,0,0"
                  Content="3D"/>

EgtStoneLib/VeinMatchingWindow.xaml.vb

@@ -1,7 +1,6 @@
 Imports System.IO
 Imports System.Windows.Interop
 Imports System.Collections.ObjectModel
-Imports System.Runtime.InteropServices
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports OmagOFFICE.VeinMatchingWindow
@@ -51,11 +50,11 @@ Public Class VeinMatchingWindow
       ' Per non farla visualizzare alla creazione
       Me.Left = 32000
       ' Assegno messaggi
-      ExportBtn.Content = EgtMsg(MSG_VEINMATCHING + 1)        ' Esporta
-      ShowTextBtn.Content = EgtMsg(MSG_VEINMATCHING + 2)      ' Mostra Info
-      EditBtn.Content = EgtMsg(MSG_VEINMATCHING + 3)          ' Modifica
-      VerifyBtn.Content = EgtMsg(MSG_VEINMATCHING + 4)        ' Verifica
-      MagneticBtn.Content = EgtMsg(MSG_VEINMATCHING + 5)      ' Magnetico
+      ExportBtn.Content = EgtMsg(91601)        ' Esporta
+      ShowTextBtn.Content = EgtMsg(91609)      ' Mostra Info
+      EditBtn.Content = EgtMsg(91610)          ' Modifica
+      VerifyBtn.Content = EgtMsg(91611)        ' Verifica
+      MagneticBtn.Content = EgtMsg(91612)      ' Magnetico
    End Sub
 
    Private Sub Window_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

InstrumentPanel/PrintPanelVM.vb

@@ -78,7 +78,7 @@ Public Class PrintPanelVM
             tmpImg.Stretch = Stretch.Uniform
             tmpImg.EndInit()
             ' eseguo la stampa
-            printDlg.PrintVisual(tmpImg, "Parts Layout")
+            printDlg.PrintVisual(tmpImg, EgtMsg(91688))    ' Parts Layout
          Catch
             ' Rrror in executing print
             EgtOutLog(EgtMsg(50182))

MachOptionWindow/MachOptionWindowVM.vb

@@ -576,13 +576,13 @@ Public Class MachOptionWindowVM
 
    Public ReadOnly Property OkMsg As String
       Get
-         Return "Ok"
+         Return EgtMsg(91651) ' Ok
       End Get
    End Property
 
    Public ReadOnly Property CancelMsg As String
       Get
-         Return "Cancel"
+         Return EgtMsg(91652) ' Cancel
       End Get
    End Property
 

MachinePanel/MachinePanelV.xaml

@@ -9,17 +9,19 @@
             Height="20" Width="150"/>-->
 
     <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="Uniform"/>
+        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="Uniform"/>
     </Button>
     <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="UniformToFill"/>
-    </Button>
-    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="UniformToFill"/>
     </Button>
     <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}" Style="{StaticResource ToolBar_Button}">
         <Image Source="/Resources/NewIcons/ToolChangerPos.png" Stretch="Uniform" />
     </Button>
     <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
-           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
+           Style="{StaticResource ToolBar_Button}" Visibility="{Binding WjDb_Visibility}">
+        <Image Source="/Resources/NewIcons/DB-WJ.png" Stretch="UniformToFill"/>
+    </Button>
+    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+    </Button>
 </DockPanel>

MachinePanel/MyMachinePanelVM.vb

@@ -105,7 +105,7 @@ Public Class MyMachinePanelVM
       ' procedo ad inizializzare la classe → carico la lista "MachineList" che visualizzo per l'inserimento di nuovi MachGroup
       Machine.MachineListInit(sMchRoots, MachineList)
       ' Inizializzo valori visibilità parametri Db utensili e lavorazioni
-      OmagOFFICETMDbParamVisibility.Init()
+      ' OmagOFFICETMDbParamVisibility.Init()
    End Sub
 
    ''' <summary>
@@ -148,8 +148,10 @@ Public Class MyMachinePanelVM
 
       ' Definisco lo stile della ComboBox
       ToolDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      ToolDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      ToolDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      ToolDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
       ToolDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
       ToolDbWindowVM.HeightCmBxTxBl = "25"
       ToolDbWindowVM.WidthCmBxTxBl = "Auto"
@@ -159,7 +161,7 @@ Public Class MyMachinePanelVM
       ToolDbWindowVM.BackgroundButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundButton = Brushes.White
       ToolDbWindowVM.BorderBrushButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BorderThicknessButton = 1.0
+      ToolDbWindowVM.BorderThicknessButton = New Thickness(1)
 
       ''Definisco lo stile della DataGrid
       'ToolDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
@@ -210,9 +212,15 @@ Public Class MyMachinePanelVM
          MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
+
+      EgtOutLog("Call function: Creazione oggetto MachDbWindowVM")
+      TimeSpanInit()
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone", OmagOFFICEMap.refMainWindowVM.MainWindowM.nUserLevel > 5)
       ' Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      EgtOutLog(TimeSpanEnd())
 
+      EgtOutLog("Call function: Aggiorna oggetto MachDbWindowVM")
+      TimeSpanInit()
       MachDbWindowVM.bPersonalInterface = True
 
       ' Collegata allo stile della GroupBox
@@ -230,11 +238,14 @@ Public Class MyMachinePanelVM
       MachDbWindowVM.ForegroundTxBlDisable = Brushes.White
       MachDbWindowVM.GeneralForeground = Brushes.White
       MachDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.MyForegroundChColor = Brushes.White
 
       ' Definisco lo stile della ComboBox
       MachDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      MachDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      MachDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
       MachDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
       MachDbWindowVM.HeightCmBxTxBl = "25"
       MachDbWindowVM.WidthCmBxTxBl = "Auto"
@@ -244,35 +255,44 @@ Public Class MyMachinePanelVM
       MachDbWindowVM.BackgroundIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundIsChecked = Brushes.White
       MachDbWindowVM.BorderBrushIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BorderThicknessIsChecked = 1.0
+      MachDbWindowVM.BorderThicknessIsChecked = New Thickness(1)
       MachDbWindowVM.OpacityIsChecked = 0.25
 
       'Definisco lo stile della DataGrid
-      'MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
-      'MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      'MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      'MachDbWindowVM.ForegroundHeader = Brushes.White
-      'MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.BorderThicknessHeader = 0.0
-      'MachDbWindowVM.FontWeightHeader = FontWeights.Bold
-      'MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.ForegroundDataGridRow = Brushes.White
-      'MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
-      'MachDbWindowVM.BorderThicknessDataGridRow = "0 0 0 1"
-      'MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
-      'MachDbWindowVM.BorderThicknessDataGridCell = "0 0 1 0"
+      MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
+      MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.ForegroundHeader = Brushes.White
+      MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderThicknessHeader = New Thickness(0)
+      MachDbWindowVM.FontWeightHeader = FontWeights.Bold
+      MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.ForegroundDataGridRow = Brushes.White
+      MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
+      MachDbWindowVM.BorderThicknessDataGridRow = New Thickness(0, 0, 0, 1)
+      MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
+      MachDbWindowVM.BorderThicknessDataGridCell = New Thickness(0, 0, 1, 0)
 
+      EgtOutLog(TimeSpanEnd())
+
+      EgtOutLog("Call function: Creazione oggetto MachDbWindowV")
+      TimeSpanInit()
       Dim MachDbWindowV As New MyMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
 
 
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
+         EgtOutLog("Call function: Visualizzazione oggetto MachDbWindowV")
+         TimeSpanInit()
          MachDbWindowV.Height = 768
          MachDbWindowV.Width = 1024
          MachDbWindowV.ShowDialog()
+         EgtOutLog(TimeSpanEnd())
       Else
          Exit Sub
       End If
+
+
       ' Verifico che gli utensili delle lavorazioni correnti siano attrezzati (necessario perchè potrei aver cambiato gli utensili delle lavorazioni)
       ' e che le lavorazioni correnti siano compatibili con materiale e spessore
       ' Lama

MainWindow/MainWindowM.vb

@@ -219,12 +219,17 @@ Public Class MainWindowM
       EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey( sNestKey)
       Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
-      EgtSetNetHwKey( bNetHwKey)
+      EgtSetNetHwKey(bNetHwKey)
+      Dim sLockId As String = ""
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
+      If Not String.IsNullOrEmpty(sLockId) Then
+         EgtSetLockId(sLockId)
+      End If
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2509, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2509, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2707, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2707, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -286,7 +291,7 @@ Public Class MainWindowM
       ' Leggo nome cartella delle foto
       GetMainPrivateProfileString(S_GENERAL, K_PHOTODIR, sDataRoot & "\Data", m_sPhotoDir)
       ' Creo connessione al Db
-      If m_SlabDB And Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
+      If m_SlabDB AndAlso Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
          EgtOutLog("Error connecting to DB")
          MessageBox.Show(EgtMsg(92000 + 1), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)
          m_SlabDB = False
@@ -294,6 +299,7 @@ Public Class MainWindowM
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
+      EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
       EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions))
       EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)

MainWindow/MainWindowVM.vb

@@ -152,6 +152,7 @@ Public Class MainWindowVM
       If Not IsNothing(OmagOFFICEMap.refSplitModeVM) Then
          OmagOFFICEMap.refSplitModeVM.DeactiveSplitCut()
          OmagOFFICEMap.refSplitModeVM.DeselectWJBridgesPart()
+         OmagOFFICEMap.refSplitModeVM.ResetAllMark()
       End If
    End Sub
 

My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("OmagOFFICE")>
-<Assembly: AssemblyCopyright("Copyright ©  2017-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2017-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 'In order to begin building localizable applications, set 
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.9.5")>
-<Assembly: AssemblyFileVersion("2.5.9.5")>
+<Assembly: AssemblyVersion("2.7.7.1")>
+<Assembly: AssemblyFileVersion("2.7.7.1")>
 

MyMachGroupPanel/MyMachGroupPanelVM.vb

@@ -351,11 +351,11 @@ Public Class MyMachGroup
          If Not EgtGetInfo(Id, INFO_SLABHEIGHT, dSlabHeight) Then dSlabHeight = 0
          Dim sCurrSawing As String = String.Empty
          If Not EgtGetInfo(m_nOpersGroupId, INFO_CURRSAWING, sCurrSawing) Then sCurrSawing = "---"
-         Return "Name: " & sSlabName & Environment.NewLine &
-                "Material: " & sMaterial & Environment.NewLine &
-                "Thickness: " & LenToString(dSlabHeight, 3) & Environment.NewLine &
-                "Sawing: " & sCurrSawing & Environment.NewLine &
-                "Machine: " & Machine
+         Return EgtMsg(91683) & sSlabName & Environment.NewLine &                   ' Name: 
+                EgtMsg(91684) & sMaterial & Environment.NewLine &                   ' Material: 
+                EgtMsg(91685) & LenToString(dSlabHeight, 3) & Environment.NewLine & ' Thickness: 
+                EgtMsg(91686) & sCurrSawing & Environment.NewLine &                 ' Sawing: 
+                EgtMsg(91687) & Machine                                             ' Machine: 
       End Get
    End Property
 

MyMachiningDbWindow/MyMachiningDbWindowV.xaml

@@ -12,199 +12,199 @@
    CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                             Height="900">
 
-    <EgtWPFLib5:EgtCustomWindow.InputBindings>
-        <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
+   <EgtWPFLib5:EgtCustomWindow.InputBindings>
+      <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
          CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
-    </EgtWPFLib5:EgtCustomWindow.InputBindings>
+   </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-    <EgtWPFLib5:EgtCustomWindow.Resources>
-        <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
-        <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLap">47</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="StepBack">55</sys:Int32>
-        <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
-        <sys:Int32 x:Key="BackFeed">57</sys:Int32>
-        <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
-        <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
-        <sys:Int32 x:Key="Probing">60</sys:Int32>
-        <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
-        <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
-        <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
-        <sys:Int32 x:Key="IntCornType">64</sys:Int32>
-        <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
-        <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
-        <sys:Int32 x:Key="LiHole">67</sys:Int32>
-        <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
-        <sys:Int32 x:Key="LpTurns">69</sys:Int32>
-        <sys:Int32 x:Key="HpTurns">70</sys:Int32>
-        <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
-        <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
-    </EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <!--<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>-->
+      <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLap">47</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="StepBack">55</sys:Int32>
+      <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+      <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+      <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+      <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+      <sys:Int32 x:Key="Probing">60</sys:Int32>
+      <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+      <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+      <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+      <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+      <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+      <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+      <sys:Int32 x:Key="LiHole">67</sys:Int32>
+      <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+      <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+      <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+      <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
+      <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
-    <Grid Background="Transparent">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.95*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+   <Grid Background="Transparent">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.95*"/>
+         <ColumnDefinition Width="2*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
 
-        <Grid Background="Transparent">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.75*"/>
-                <RowDefinition Height="12*"/>
-            </Grid.RowDefinitions>
+      <Grid Background="Transparent">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.75*"/>
+            <RowDefinition Height="12*"/>
+         </Grid.RowDefinitions>
 
-            <UniformGrid Grid.Row="0" Columns="8">
-                <Button ToolTip="New" Command="{Binding NewCommand}"
+         <UniformGrid Grid.Row="0" Columns="8">
+            <Button ToolTip="New" Command="{Binding NewCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"              
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Save" Command="{Binding SaveCommand}"
+               <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Save" Command="{Binding SaveCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"        
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
+               <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"        
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
-                </Button>
+               <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+            </Button>
 
-                <Button ToolTip="Import" Command="{Binding ImportCommand}"
+            <Button ToolTip="Import" Command="{Binding ImportCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"         
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Export" Command="{Binding ExportCommand}"
+               <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Export" Command="{Binding ExportCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"       
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Reset" Command="{Binding ReloadMachiningCommand}"
+               <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Reset" Command="{Binding ReloadMachiningCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"      
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
-                </Button>
-            </UniformGrid>
+               <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
 
 
-            <TreeView Name="MachiningsTreeView" Grid.Row="1"
+         <TreeView Name="MachiningsTreeView" Grid.Row="1"
                       Background="Transparent" BorderThickness="0"
                       ItemsSource="{Binding Path=MachiningsList}">
-                <TreeView.ItemContainerStyle>
-                    <Style TargetType="{x:Type TreeViewItem}">
-                        <Setter Property="FontSize" Value="10" />
-                        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
-                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
-                    </Style>
-                </TreeView.ItemContainerStyle>
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource Db_TreeViewItem}">
+                  <Setter Property="FontSize" Value="10" />
+                  <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
 
-                <TreeView.Resources>
-                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
 
-                        <Grid  Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+                  <Grid  Background="Transparent">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
 
-                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
-                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
-                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
 
-                        </Grid>
+                  </Grid>
 
-                    </HierarchicalDataTemplate>
-                    
-                    <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                        <Grid  Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+               </HierarchicalDataTemplate>
 
-                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
+               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
+                  <Grid  Background="Transparent">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
                                        VerticalAlignment="Center" HorizontalAlignment="left"/>
-                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
 
-                        </Grid>
+                  </Grid>
 
-                    </DataTemplate>
-                </TreeView.Resources>
-                
-            </TreeView>
-            
+               </DataTemplate>
+            </TreeView.Resources>
 
-        </Grid>
+         </TreeView>
 
-        <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-    </Grid>
+      </Grid>
+
+      <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+   </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>

MySceneHost/MySceneHostVM.vb

@@ -47,12 +47,27 @@ Public Class MySceneHostVM
       ' Problemi
       ' Se manca la chiave
       If OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -1 Or OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         If Not EgtGetNetHwKey() Then
+            EgtOutLog("Missing Dongle")
+            ' Box di avviso chiave mancante : "Chiave non presente. \nInserirla e riavviare il programma."  "Errore"
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            EgtOutLog("NetDongle is full")
+            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC." "Errore"
+            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         End If
+         ' Se altrimenti manca il collegamento con la chiave di rete
+      ElseIf OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -9 Then
+         EgtOutLog("Missing Link with Net Dongle")
+         ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione." "Errore"
+         Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
+         Dim sTitle As String = EgtMsg(10101)
          MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-      ' Altrimenti manca la licenza
+         ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
@@ -87,12 +102,14 @@ Public Class MySceneHostVM
 
    Public Overrides Sub InitSceneEvents()
       AddHandler MainScene.OnMouseDownScene, AddressOf OnMouseDownScene
+      'AddHandler OnMouseDownScene_DoubleClick_1, AddressOf OnMouseDownScene_DoubleClick
       AddHandler MainScene.OnMouseMoveScene, AddressOf OnMouseMoveScene
       AddHandler MainScene.OnMouseUpScene, AddressOf OnMouseUpScene
       AddHandler MainScene.KeyDown, AddressOf OnKeyDownScene
       AddHandler MainScene.OnCursorPos, AddressOf OnCursorPos
       AddHandler MainScene.OnShowDistance, AddressOf OnShowDistance
       AddHandler MainScene.OnChangedSnapPointType, AddressOf OnChangedSnapPointType
+
    End Sub
 
    Private Sub PreInitializeScene()
@@ -719,6 +736,8 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnSavingProject(ByVal sender As Object, sFile As String)
+      ' Salvo le info del progetto
+      TopCommandBarVM.SetInfoProj(sFile)
       ' Recupero tutti i file di texture associabili ai gruppi di lavoro del progetto
       Dim sDirToSearch As String = Path.GetDirectoryName(sFile)
       Dim sFileToSearch As String = Path.GetFileNameWithoutExtension(sFile) & "." & PHOTO_NAME & "*"
@@ -792,6 +811,13 @@ Public Class MySceneHostVM
    Private Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs)
       ' Si può selezionare solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or Not MainScene.IsStatusNull() Then Return
+      If e.Clicks > 1 Then
+         Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
+            Case OptionPanelVM.Tabs.MACHINING
+               OmagOFFICEMap.refMachiningTabVM.OnMouseDownScene_DoubleClick(sender, e)
+            Case OptionPanelVM.Tabs.SIMUL
+         End Select
+      End If
       ' Chiamo l'opportuno gestore
       Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
          Case OptionPanelVM.Tabs.RAWPART

MyToolDbWindow/MyToolDbWindowV.xaml

@@ -1,165 +1,165 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MyToolDbWindowV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseToolsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-   Height="900">
-    <EgtWPFLib5:EgtCustomWindow.InputBindings>
-        <KeyBinding Key="Escape" Command="{Binding ReloadToolCommand}"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseToolsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                            Height="900">
+   <EgtWPFLib5:EgtCustomWindow.InputBindings>
+      <KeyBinding Key="Escape" Command="{Binding ReloadToolCommand}"
          CommandParameter="{Binding Path=SelectedItem,ElementName=ToolsTreeView}"/>
-    </EgtWPFLib5:EgtCustomWindow.InputBindings>
+   </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-    <EgtWPFLib5:EgtCustomWindow.Resources>
-        <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
-        <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
-        <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-        <sys:Int32 x:Key="Corr">0</sys:Int32>
-        <sys:Int32 x:Key="ExitPar">1</sys:Int32>
-        <sys:Int32 x:Key="Coolant">2</sys:Int32>
-        <sys:Int32 x:Key="CornRad">3</sys:Int32>
-        <sys:Int32 x:Key="Diam">4</sys:Int32>
-        <sys:Int32 x:Key="TotDiam">5</sys:Int32>
-        <sys:Int32 x:Key="Feed">6</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">7</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">8</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">9</sys:Int32>
-        <sys:Int32 x:Key="Len">10</sys:Int32>
-        <sys:Int32 x:Key="TotLen">11</sys:Int32>
-        <sys:Int32 x:Key="MaxMat">12</sys:Int32>
-        <sys:Int32 x:Key="LonOffset">13</sys:Int32>
-        <sys:Int32 x:Key="RadOffset">14</sys:Int32>
-        <sys:Int32 x:Key="Speed">15</sys:Int32>
-        <sys:Int32 x:Key="SideAng">16</sys:Int32>
-        <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
-        <sys:Int32 x:Key="Thick">18</sys:Int32>
-        <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
-        <sys:Int32 x:Key="MinFeed">20</sys:Int32>
-        <sys:Int32 x:Key="Draw">21</sys:Int32>
-        <sys:Int32 x:Key="Head">22</sys:Int32>
-        <sys:Int32 x:Key="NamePar">23</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">24</sys:Int32>
-        <sys:Int32 x:Key="TcPos">25</sys:Int32>
-    </EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <!--<EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>-->
+      <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+      <sys:Int32 x:Key="Corr">0</sys:Int32>
+      <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+      <sys:Int32 x:Key="Coolant">2</sys:Int32>
+      <sys:Int32 x:Key="CornRad">3</sys:Int32>
+      <sys:Int32 x:Key="Diam">4</sys:Int32>
+      <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+      <sys:Int32 x:Key="Feed">6</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+      <sys:Int32 x:Key="Len">10</sys:Int32>
+      <sys:Int32 x:Key="TotLen">11</sys:Int32>
+      <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+      <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+      <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+      <sys:Int32 x:Key="Speed">15</sys:Int32>
+      <sys:Int32 x:Key="SideAng">16</sys:Int32>
+      <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+      <sys:Int32 x:Key="Thick">18</sys:Int32>
+      <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+      <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+      <sys:Int32 x:Key="Draw">21</sys:Int32>
+      <sys:Int32 x:Key="Head">22</sys:Int32>
+      <sys:Int32 x:Key="NamePar">23</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+      <sys:Int32 x:Key="TcPos">25</sys:Int32>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
-    <Grid Background="Transparent">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.95*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+   <Grid Background="Transparent">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.95*"/>
+         <ColumnDefinition Width="2*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
 
-        <Grid Background="Transparent">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.75*"/>
-                <RowDefinition Height="12*"/>
-            </Grid.RowDefinitions>
+      <Grid Background="Transparent">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.75*"/>
+            <RowDefinition Height="12*"/>
+         </Grid.RowDefinitions>
 
-            <UniformGrid Grid.Row="0" Columns="8">
-                <Button ToolTip="New" Command="{Binding NewCommand}"
-                CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Save" Command="{Binding SaveCommand}"
-                CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
-                CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
-                </Button>
+         <UniformGrid Grid.Row="0" Columns="8">
+            <Button ToolTip="New" Command="{Binding NewCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
+                    Style = "{DynamicResource MachiningDB_Button}">
+               <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Save" Command="{Binding SaveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
+                    Style = "{DynamicResource MachiningDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
+                    Style = "{DynamicResource MachiningDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+            </Button>
 
-                <Button ToolTip="Import" Command="{Binding ImportCommand}"
-                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Export" Command="{Binding ExportCommand}"
-                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Reset" Command="{Binding ReloadToolCommand}"
-                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
-                </Button>
-            </UniformGrid>
+            <Button ToolTip="Import" Command="{Binding ImportCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
+                    Style = "{DynamicResource MachiningDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Export" Command="{Binding ExportCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
+                    Style = "{DynamicResource MachiningDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Reset" Command="{Binding ReloadToolCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
+                    Style = "{DynamicResource MachiningDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
 
-            <!--Elenco degli utensili-->
-            <TreeView Name="ToolsTreeView" Grid.Row="1"
-                      Background="Transparent" BorderThickness="0"
-                      ItemsSource="{Binding ToolsList}">
-                <TreeView.ItemContainerStyle>
-                    <Style TargetType="{x:Type TreeViewItem}">
-                        <Setter Property="FontSize" Value="10" />
-                        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
-                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
-                    </Style>
-                </TreeView.ItemContainerStyle>
+         <!--Elenco degli utensili-->
+         <TreeView Name="ToolsTreeView" Grid.Row="1"
+                   Background="Transparent" BorderThickness="0"
+                   ItemsSource="{Binding ToolsList}">
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource Db_TreeViewItem}">
+                  <Setter Property="FontSize" Value="10" />
+                  <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
 
-                <TreeView.Resources>
-                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolTreeViewItem}" ItemsSource="{Binding Items}">
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolTreeViewItem}" ItemsSource="{Binding Items}">
 
-                        <Grid  Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+                  <Grid  Background="Transparent">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
 
-                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
-                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
-                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
 
-                        </Grid>
+                  </Grid>
 
-                    </HierarchicalDataTemplate>
+               </HierarchicalDataTemplate>
 
-                    <DataTemplate DataType="{x:Type EgtWPFLib5:ToolTreeViewItem}">
-                        <Grid  Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+               <DataTemplate DataType="{x:Type EgtWPFLib5:ToolTreeViewItem}">
+                  <Grid  Background="Transparent">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
 
-                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
-                                       VerticalAlignment="Center" HorizontalAlignment="left"/>
-                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
+                                VerticalAlignment="Center" HorizontalAlignment="left"/>
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
 
-                        </Grid>
+                  </Grid>
 
-                    </DataTemplate>
+               </DataTemplate>
 
-                </TreeView.Resources>
+            </TreeView.Resources>
 
-            </TreeView>
+         </TreeView>
 
-        </Grid>
+      </Grid>
 
-        <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1"/>
+      <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1"/>
 
-        <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
-        <ContentControl Content="{Binding ToolSceneHost}" Grid.Column="2"/>
+      <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
+      <ContentControl Content="{Binding ToolSceneHost}" Grid.Column="2"/>
 
-    </Grid>
+   </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>

MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml

@@ -116,6 +116,15 @@
                      </DataTemplate>
                   </DataGridTextColumn.HeaderTemplate>
                </DataGridTextColumn>
+               <!--Flux-->
+               <DataGridTextColumn Binding="{Binding Flux}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Flux_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>  
                <!--Q1-->
                <DataGridTextColumn Binding="{Binding Q1}"
                             Width="*">

OmagOFFICE.vbproj

@@ -128,18 +128,20 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\OmagOFFICE\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtUILib">
-      <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
+    <Reference Include="EgtUILib, Version=2.7.5.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\EgtProg\OmagOFFICE\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib5">
-      <HintPath>..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
+    <Reference Include="EgtWPFLib5, Version=2.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\EgtProg\OmagOFFICE\EgtWPFLib5.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System.Core" />
@@ -291,6 +293,10 @@
       <DependentUpon>SplitModeV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptionPanel\MachiningTab\SplitModeVM.vb" />
+    <Compile Include="OptionPanel\NestingTab\ChangeTableV.xaml.vb">
+      <DependentUpon>ChangeTableV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="OptionPanel\NestingTab\ChangeTableVM.vb" />
     <Compile Include="OptionPanel\NestingTab\MultiSelectionV.xaml.vb">
       <DependentUpon>MultiSelectionV.xaml</DependentUpon>
     </Compile>
@@ -497,6 +503,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="OptionPanel\NestingTab\ChangeTableV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OptionPanel\NestingTab\MultiSelectionV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -951,6 +961,41 @@
   <ItemGroup>
     <Resource Include="Resources\CsvWindow\Parcheggia-pezzo CSV.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Linea-Elimina.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Linea-Muovi.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Linea-Copia.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\DB-WJ.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Cancel.png" />
+    <Resource Include="Resources\DetailPage\Confirm.png" />
+    <Resource Include="Resources\DetailPage\Elimina.png" />
+    <Resource Include="Resources\DetailPage\Pencil.png" />
+    <Resource Include="Resources\DetailPage\Photo.png" />
+    <Resource Include="Resources\DetailPage\Polygon.png" />
+    <Resource Include="Resources\DetailPage\Print.png" />
+    <Resource Include="Resources\DetailPage\Reset.png" />
+    <Resource Include="Resources\DetailPage\Rubber.png" />
+    <Resource Include="Resources\DetailPage\Save.png" />
+    <Resource Include="Resources\DetailPage\ZoomAll.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\LightArrowOff.png" />
+    <Resource Include="Resources\NewIcons\LightArrowOn.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\table.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\tableS.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe

OptionPanel/MachiningTab/MachiningTabVM.vb

@@ -334,6 +334,12 @@ Public Class MachiningTabVM
       End If
    End Sub
 
+   Friend Sub OnMouseDownScene_DoubleClick(sender As Object, e As Windows.Forms.MouseEventArgs)
+      If m_MachiningMode = MachiningModeOpt.SPLIT Then
+         OmagOFFICEMap.refSplitModeVM.OnMouseDownScene_DoubleClick(sender, e)
+      End If
+   End Sub
+
 #End Region    ' EVENTS
 
 End Class

OptionPanel/MachiningTab/MoveRawModeVM.vb

@@ -749,7 +749,7 @@ Public Class MoveRawModeVM
                If VerifyCollisionWithOtherRawPart(nId) Then
                   ' mantengo la selezione del pezzo
                   EgtSetStatus(nId, GDB_ST.SEL)
-                  OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+                  OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91231), 3, MSG_TYPE.ERROR_)      ' Collisione pezzi
                Else
                   ' Se con ventose, le nascondo
                   If Not OmagOFFICEMap.refMachiningTabVM.ByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
@@ -761,7 +761,7 @@ Public Class MoveRawModeVM
                If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
                   ' mantengo la selezione del pezzo
                   EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-                  OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+                  OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91231), 3, MSG_TYPE.ERROR_)     ' Collisione pezzi
                   EgtDraw()
                   ' esco dal ciclo, prima devo depositare correttamente il pezzo
                   Exit While
@@ -819,7 +819,7 @@ Public Class MoveRawModeVM
       If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
          ' mantengo la selezione del pezzo
          EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-         OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+         OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91231), 3, MSG_TYPE.ERROR_)    ' Collisione pezzi
          EgtDraw()
       End If
 

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -6,16 +6,30 @@
     <UserControl.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding SplitCutCommand}" />
     </UserControl.InputBindings>
-    
+
     <StackPanel IsEnabled="{Binding SplitModeIsEnabled}">
 
         <Border Margin="0,0,0,5" Style="{StaticResource BorderSplit}" Padding="0">
             <ListBox ItemsSource="{Binding ItemList}"
-               Background="{StaticResource Omag_Gray}"
-               DisplayMemberPath="Name"
+               Background="{StaticResource Omag_Gray}"      
                SelectionMode="Extended"
                BorderThickness="0"
                Height="200" Margin="0,0,0,0">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                            <Image Margin="1" Height="20" Width="20"
+                                   Source="{Binding SourceImg}">
+                            </Image>
+                            <TextBlock Margin="1" Text="{Binding Name}"/>
+                            <StackPanel.InputBindings>
+                                <MouseBinding MouseAction="LeftDoubleClick" 
+                                   Command="{Binding Path=DataContext.OnOffCommand,
+                                                     RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor }}"/>
+                            </StackPanel.InputBindings>
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="ListBoxItem">
                         <Style.Triggers>
@@ -30,224 +44,239 @@
                             </DataTrigger>
                         </Style.Triggers>
                         <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                     </Style>
                 </ListBox.ItemContainerStyle>
             </ListBox>
         </Border>
 
-        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,0,0,2.5">
 
-            <Button Grid.Column="1"
+            <Button
                  IsEnabled="{Binding bEnabledCommandMove}"
                  Style="{StaticResource OptionPanel_Button}"
                  Command="{Binding MoveUpCommand}"
                     Margin="0,0,0.5,0">
                 <Image Source="/Resources/NestingTab/UpArrow.png"/>
             </Button>
-            <Button Grid.Column="2"
+            <Button
                  IsEnabled="{Binding bEnabledCommandMove}"
                  Style="{StaticResource OptionPanel_Button}"
                  Command="{Binding MoveDownCommand}"
                     Margin="0.5,0,0,0">
                 <Image Source="/Resources/NestingTab/DownArrow.png"/>
             </Button>
-
+            <ToggleButton ToolTip="{Binding LayNbArrTgBtnMsg}"
+                  Style="{StaticResource Split_ToggleButton_Img}"
+                  IsChecked="{Binding LayNbArrTgBtn_IsChecked}"
+                  Height="20" Width="20"
+                      Margin="10,0,1,0">
+                <Image Source="{Binding LayNbArrTgBtnImg}"/>
+            </ToggleButton>
         </StackPanel>
 
+        <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+            <Expander Name="myExpander1" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding EnableCutMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bOnOffCut_IsExpanded}">
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="2,2.5,2,0">
 
-
-        <GroupBox Header="Attiva tagli" Style="{StaticResource GroupBoxSplit}">
-
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="2,2.5,2,0">
-
-                <!--<Button Content="{Binding OnOffMsg}"
+                    <!--<Button Content="{Binding OnOffMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding OnOffCommand}"
                     Margin="0,0,2.5,0"/>-->
-                <StackPanel Margin="1,0,0,0">
-                    <Button ToolTip="{Binding OnOffMsg}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding OnOffMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OnOffCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                        <StackPanel>
-                            <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
                             Style="{StaticResource ImgButton}"/>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
 
-                <!--<Button Content="{Binding AllOnMsg}"
+                    <!--<Button Content="{Binding AllOnMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding AllOnCommand}"
                     Margin="2.5,0,2.5,0"/>-->
-                <StackPanel Margin="1,0,0,0">
-                    <Button ToolTip="{Binding AllOnMsg}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllOnMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOnCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                        <StackPanel>
-                            <Image Source="/Resources/NewIcons/Tutti-ON.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Tutti-ON.png"
                             Style="{StaticResource ImgButton}"/>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
 
-                <!--<Button Content="{Binding AllOffMsg}"
+                    <!--<Button Content="{Binding AllOffMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding AllOffCommand}"
                     Margin="2.5,0,0,0"/>-->
-                <StackPanel Margin="1,0,0,0">
-                    <Button ToolTip="{Binding AllOffMsg}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllOffMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOffCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                        <StackPanel>
-                            <Image Source="/Resources/NewIcons/Tutti-OFF.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Tutti-OFF.png"
                             Style="{StaticResource ImgButton}"/>
-                        </StackPanel>
-                    </Button>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
                 </StackPanel>
 
-            </StackPanel>
+            </Expander>
+        </Border>
 
-        </GroupBox>
+        <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+            <Expander Name="myExpander2" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding SplitCutMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bSpLitCut_IsExpanded}">
 
-        <GroupBox Header="Tagli di separazione" Style="{StaticResource GroupBoxSplit}">
+                <StackPanel Margin="0,0,0,-2.5">
 
-            <StackPanel>
-
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
-                    <Grid>
-                        <!--<Button Content="{Binding CutMsg}"
+                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                        <Grid>
+                            <!--<Button Content="{Binding CutMsg}"
                            Style="{StaticResource OptionPanel_TextWrapButton}"
                            Command="{Binding CutCommand}"
                            Visibility="{Binding CutBtnVisibility}"
                            Margin="0,0,2.5,0"/>-->
-                        <StackPanel Visibility="{Binding CutBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding CutMsg}"
+                            <StackPanel Visibility="{Binding CutBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding CutMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding CutCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
                             Height="40" Margin="0,2,0,0" 
                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
 
-                        <!--<ToggleButton Grid.Row="0"
+                            <!--<ToggleButton Grid.Row="0"
                            Content="{Binding BridgeMsg}"           
                            Style="{StaticResource OptionPanel_ToggleWrapButton}"
                            IsChecked="{Binding BridgeBtn_IsChecked}"
                            Visibility="{Binding BridgeBtnVisibility}"
                            Margin="0,0,2.5,0" Padding="0"/>-->
-                        <StackPanel Visibility="{Binding BridgeBtnVisibility}" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="{Binding BridgeMsg}"
+                            <StackPanel Visibility="{Binding BridgeBtnVisibility}" Margin="1,0,0,0">
+                                <ToggleButton ToolTip="{Binding BridgeMsg}"
                                     Style="{StaticResource Split_ToggleButton_Img}"
                                     IsChecked="{Binding BridgeBtn_IsChecked}"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"            
                                     Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Ponticelli.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Ponticelli.png"
                                            Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
+                                    </StackPanel>
+                                </ToggleButton>
+                            </StackPanel>
 
-                    </Grid>
+                        </Grid>
 
-                    <Grid>
-                        <!--<Button Content="{Binding CutStartMsg}"
+                        <Grid>
+                            <!--<Button Content="{Binding CutStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding CutStartCommand}"
                        Visibility="{Binding CutStartBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>-->
-                        <StackPanel Visibility="{Binding CutStartBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding CutStartMsg}"
+                            <StackPanel Visibility="{Binding CutStartBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding CutStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding CutStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
                             Height="40" Margin="0,2,0,0" 
                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                        <!--<Button Content="{Binding QualityMsg}"
+                            <!--<Button Content="{Binding QualityMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding QualityCommand}"
                        Visibility="{Binding QualityBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>!-->
-                        <StackPanel Visibility="{Binding QualityBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding QualityMsg}"
+                            <StackPanel Visibility="{Binding QualityBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding QualityMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding QualityCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Quality.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Quality.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                    </Grid>
+                        </Grid>
 
-                    <Grid>
-                        <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding CutEndMsg}"
+                        <Grid>
+                            <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding CutEndMsg}"
                                 Style="{StaticResource Split_Button_Img}"
                                 Command="{Binding CutEndCommand}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"            
                                 Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
                                         Height="40" Margin="0,2,0,0" 
                                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                        <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
+                            <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
+                                <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
                                 Style="{StaticResource Split_ToggleButton_Img}"
                                 IsChecked="{Binding BridgeDeleteBtn_IsChecked}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"            
                                 Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
                                            Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
+                                    </StackPanel>
+                                </ToggleButton>
+                            </StackPanel>
 
-                    </Grid>
-                </StackPanel>
+                        </Grid>
+                    </StackPanel>
 
 
 
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
 
-                    <!--Bottone invisibile per permetter il corretto allineamento-->
-                    <!--
+                        <!--Bottone invisibile per permetter il corretto allineamento-->
+                        <!--
                     <Button Content="{Binding }" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding }"
@@ -256,44 +285,45 @@
 
 
 
-                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllExtendMsg}" 
+                        <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllExtendMsg}" 
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllExtendCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Tutti-allunga.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Tutti-allunga.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllReduceMsg}" 
+                        <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllReduceMsg}" 
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllReduceCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Tutti-accorcia.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Tutti-accorcia.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
                     </StackPanel>
 
-                </StackPanel>
-
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    <!--<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
                     <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="{Binding AllExtendMsg}" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateCut_IsChecked}"
                        HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
+                       VerticalAlignment="Center"   
+                       Width="40" Height="40"               
+                       Margin="1,0,0,0">
                             <StackPanel>
                                 <Image Source="/Resources/NewIcons/Crea-taglio.png"
                             Style="{StaticResource ImgButton}"/>
@@ -306,7 +336,8 @@
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding RemoveCut_IsChecked}"
                        HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
+                       VerticalAlignment="Center"       
+                       Width="40" Height="40"               
                        Margin="0,0,0,0">
                             <StackPanel>
                                 <Image Source="/Resources/NewIcons/Rimuovi-taglio.png"
@@ -320,184 +351,278 @@
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateParallelCut_IsChecked}"
                        HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
+                       VerticalAlignment="Center"   
+                       Width="40" Height="40"               
+                       Margin="1,0,0,0">
                             <StackPanel>
                                 <Image Source="/Resources/NewIcons/Crea-taglio-parallelo.png"
                             Style="{StaticResource ImgButton}"/>
                             </StackPanel>
                         </ToggleButton>
                     </StackPanel>
+                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="{Binding AllExtendMsg}" 
+                       Style="{StaticResource Split_ToggleButton_Img}"
+                       IsChecked="{Binding CreateParallelCut_IsChecked}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"  
+                       Width="40" Height="40"               
+                       Margin="1,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Modifica-taglio.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
+                </StackPanel>-->
+
                 </StackPanel>
 
-            </StackPanel>
+            </Expander>
+        </Border>
 
-        </GroupBox>
+        <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+            <Expander Name="myExpander3" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding DirectSplitCutMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bDirectSpLitCut_IsExpanded}">
 
-        <GroupBox Header="Modifica attacchi tagli" Style="{StaticResource GroupBoxSplit}">
-            <StackPanel Margin="0,0,0,-2.5">
-                <UniformGrid Columns="4" Margin="0,2.5,0,1">
-                    <StackPanel Visibility="{Binding OutCenStartBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding OutCenStartMsg}"
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Crea" 
+                       Style="{StaticResource Split_ToggleButton_Img}"
+                       IsChecked="{Binding CreateCut_IsChecked}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"   
+                       Width="40" Height="40"               
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
+
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Elimina" 
+                       Style="{StaticResource Split_ToggleButton_Img}"
+                       IsChecked="{Binding RemoveCut_IsChecked}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"       
+                       Width="40" Height="40"               
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea-Elimina.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
+
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Copia" 
+                       Style="{StaticResource Split_ToggleButton_Img}"
+                       IsChecked="{Binding CreateParallelCut_IsChecked}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"   
+                       Width="40" Height="40"               
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea-Copia.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Muovi" 
+                       Style="{StaticResource Split_ToggleButton_Img}"
+                       IsChecked="{Binding ModifyCut_IsChecked}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"  
+                       Width="40" Height="40"               
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea-Muovi.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
+                </StackPanel>
+
+            </Expander>
+        </Border>
+
+        <Border Style="{StaticResource Border}" Margin="0,1,0,0">
+            <Expander Name="myExpander4" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding ManageStartEndCutMsg}" 
+                  ExpandDirection="Down" IsExpanded="{Binding bModifyCut_IsExpanded}">
+
+                <StackPanel Margin="0,0,0,-2.5">
+                    <UniformGrid Columns="4" Margin="0,2.5,0,1">
+                        <StackPanel Visibility="{Binding OutCenStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding OutCenStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OutCenStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllOutStartMsg}"
+                        <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllOutStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOutStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllCenStartMsg}"
+                        <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllCenStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllCenStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                    <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding OutCenEndMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding OutCenEndCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
-                            Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-
-                </UniformGrid>
-
-                <UniformGrid Columns="4" Margin="0,0,0,1">
-
-                    <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllOutEndMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding AllOutEndCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
-                            Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-
-                    <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllCenEndMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding AllCenEndCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
-                            Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-
-                    <StackPanel Margin="1,0,0,0">
-                        <Button ToolTip="{Binding ModifStartMsg}"
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding ModifStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding ModifStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
 
-                    <StackPanel Margin="1,0,0,0">
-                        <Button ToolTip="{Binding ModifEndMsg}"
+                        </StackPanel>
+
+                    </UniformGrid>
+
+                    <UniformGrid Columns="4" Margin="0,0,0,1">
+                        <StackPanel Margin="1,0,0,0" Visibility="{Binding OutCenEndBtnVisibility}">
+                            <Button ToolTip="{Binding OutCenEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding OutCenEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+                        <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllOutEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllOutEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+                        <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllCenEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllCenEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding ModifEndCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Modifica-Fine.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Modifica-Fine.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                </UniformGrid>
+                    </UniformGrid>
 
-                <UniformGrid Columns="4" Margin="0,0,0,1">
+                    <UniformGrid Columns="4" Margin="0,0,0,1">
 
-                    <!--Bottone invisibile per permetter il corretto allineamento-->
-                    <Button Content="{Binding }" Grid.Column="0"
+                        <!--Bottone invisibile per permetter il corretto allineamento-->
+                        <Button Content="{Binding }" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding }"
                         Visibility="Hidden"
                        Margin="0,0,1,0"/>
 
-                    <StackPanel Margin="1,0,0,0">
-                        <Button ToolTip="{Binding PauseMsg}"
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding PauseMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding PauseCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
                             Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                    <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding InvertMsg}"
+                        <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding InvertMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding InvertCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inverti.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inverti.png"
                                  Style="{StaticResource ImgButton}"/>
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                </UniformGrid>
+                    </UniformGrid>
 
-            </StackPanel>
-
-        </GroupBox>
+                </StackPanel>
 
+            </Expander>
+        </Border>
     </StackPanel>
 
 </UserControl>

OptionPanel/MachiningTab/SplitModeVM.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.Drawing
+Imports System.Reflection
 Imports System.Security.Cryptography
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -51,6 +52,7 @@ Public Class SplitModeVM
    Private m_IdSplitGroup As Integer = GDB_ID.NULL
    Private m_IdSplitGroupLayer As Integer = GDB_ID.NULL
    Private m_IdCurrRawSolid As Integer = GDB_ID.NULL
+   Private m_IdSplitLineRemove As Integer = GDB_ID.NULL
 
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
@@ -281,6 +283,54 @@ Public Class SplitModeVM
       End Set
    End Property
 
+   Private m_bOnOffCut_IsExpanded As Boolean = True
+   Public Property bOnOffCut_IsExpanded As Boolean
+      Get
+         Return m_bOnOffCut_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bOnOffCut_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bOnOffCut_IsExpanded))
+         WriteMainPrivateProfileString("Split", "OnOffCut", If(m_bOnOffCut_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bSpLitCut_IsExpanded As Boolean = True
+   Public Property bSpLitCut_IsExpanded As Boolean
+      Get
+         Return m_bSpLitCut_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bSpLitCut_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bSpLitCut_IsExpanded))
+         WriteMainPrivateProfileString("Split", "SplitCut", If(m_bSpLitCut_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bDirectSpLitCut_IsExpanded As Boolean = True
+   Public Property bDirectSpLitCut_IsExpanded As Boolean
+      Get
+         Return m_bDirectSpLitCut_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bDirectSpLitCut_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bDirectSpLitCut_IsExpanded))
+         WriteMainPrivateProfileString("Split", "DirectSplitCut", If(m_bDirectSpLitCut_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bModifyCut_IsExpanded As Boolean = True
+   Public Property bModifyCut_IsExpanded As Boolean
+      Get
+         Return m_bModifyCut_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bModifyCut_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bModifyCut_IsExpanded))
+         WriteMainPrivateProfileString("Split", "ModifyCut", If(m_bModifyCut_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
    Private m_BridgeBtn_IsChecked As Boolean = False
    Public Property BridgeBtn_IsChecked As Boolean
       Get
@@ -305,6 +355,33 @@ Public Class SplitModeVM
       End Set
    End Property
 
+   Private m_LayNbArrTgBtn_IsChecked As Boolean = False
+   Public Property LayNbArrTgBtn_IsChecked As Boolean
+      Get
+         Return m_LayNbArrTgBtn_IsChecked
+      End Get
+      Set(value As Boolean)
+         ' imposto il valore della bottone, dell'icona e del messaggio
+         SetLayNbArrTgBtn_IsChecked(value)
+         WriteMainPrivateProfileString(S_GENERAL, K_SHOWNBARROW, If(m_LayNbArrTgBtn_IsChecked, "1", "0"))
+      End Set
+   End Property
+
+   Private Sub SetLayNbArrTgBtn_IsChecked(value As Boolean)
+      m_LayNbArrTgBtn_IsChecked = value
+      If value Then
+         StatusOffNumbArrow(GDB_ST.ON_)
+         m_LayNbArrTgBtnMsg = EgtMsg(91218)     ' Hide
+         m_LayNbArrTgBtnImg = "/Resources/NewIcons/LightArrowOn.png"
+      Else
+         StatusOffNumbArrow(GDB_ST.OFF)
+         m_LayNbArrTgBtnMsg = EgtMsg(91219)     ' Show
+         m_LayNbArrTgBtnImg = "/Resources/NewIcons/LightArrowOff.png"
+      End If
+      NotifyPropertyChanged(NameOf(LayNbArrTgBtnMsg))
+      NotifyPropertyChanged(NameOf(LayNbArrTgBtnImg))
+   End Sub
+
 #Region "SPLIT CUT"
 
    Private m_CreateCut_IsChecked As Boolean
@@ -316,8 +393,10 @@ Public Class SplitModeVM
          m_CreateCut_IsChecked = value
          m_RemoveCut_IsChecked = False
          m_CreateParallelCut_IsChecked = False
+         m_ModifyCut_IsChecked = False
          NotifyPropertyChanged(NameOf(RemoveCut_IsChecked))
          NotifyPropertyChanged(NameOf(CreateParallelCut_IsChecked))
+         NotifyPropertyChanged(NameOf(ModifyCut_IsChecked))
          CreateCutIsChecked()
          NotifyPropertyChanged(NameOf(CreateCut_IsChecked))
       End Set
@@ -332,8 +411,10 @@ Public Class SplitModeVM
          m_RemoveCut_IsChecked = value
          m_CreateCut_IsChecked = False
          m_CreateParallelCut_IsChecked = False
+         m_ModifyCut_IsChecked = False
          NotifyPropertyChanged(NameOf(CreateCut_IsChecked))
          NotifyPropertyChanged(NameOf(CreateParallelCut_IsChecked))
+         NotifyPropertyChanged(NameOf(ModifyCut_IsChecked))
          RemoveCutIsChecked()
          NotifyPropertyChanged(NameOf(RemoveCut_IsChecked))
       End Set
@@ -348,13 +429,33 @@ Public Class SplitModeVM
          m_CreateParallelCut_IsChecked = value
          m_CreateCut_IsChecked = False
          m_RemoveCut_IsChecked = False
+         m_ModifyCut_IsChecked = False
          NotifyPropertyChanged(NameOf(CreateCut_IsChecked))
          NotifyPropertyChanged(NameOf(RemoveCut_IsChecked))
+         NotifyPropertyChanged(NameOf(ModifyCut_IsChecked))
          CreateParellelCutIsChecked()
          NotifyPropertyChanged(NameOf(CreateParallelCut_IsChecked))
       End Set
    End Property
 
+   Private m_ModifyCut_IsChecked As Boolean
+   Public Property ModifyCut_IsChecked As Boolean
+      Get
+         Return m_ModifyCut_IsChecked
+      End Get
+      Set(value As Boolean)
+         m_ModifyCut_IsChecked = value
+         m_CreateCut_IsChecked = False
+         m_RemoveCut_IsChecked = False
+         m_CreateParallelCut_IsChecked = False
+         NotifyPropertyChanged(NameOf(CreateCut_IsChecked))
+         NotifyPropertyChanged(NameOf(RemoveCut_IsChecked))
+         NotifyPropertyChanged(NameOf(CreateParallelCut_IsChecked))
+         ModifyCutIsChecked()
+         NotifyPropertyChanged(NameOf(ModifyCut_IsChecked))
+      End Set
+   End Property
+
 #End Region    ' Split Cut
 
 #Region "Messages"
@@ -469,19 +570,57 @@ Public Class SplitModeVM
 
    Public ReadOnly Property BridgeMsg As String
       Get
-         Return "Bridge"
+         Return EgtMsg(91671)
       End Get
    End Property
 
    Public ReadOnly Property BridgeDeleteMsg As String
       Get
-         Return "Delete Bridge"
+         Return EgtMsg(91672)
       End Get
    End Property
 
    Public ReadOnly Property QualityMsg As String
       Get
-         Return "Quality"
+         Return EgtMsg(91673)
+      End Get
+   End Property
+
+   Public ReadOnly Property EnableCutMsg As String
+      Get
+         Return EgtMsg(91663)
+      End Get
+   End Property
+
+   Public ReadOnly Property SplitCutMsg As String
+      Get
+         Return EgtMsg(91664)
+      End Get
+   End Property
+
+   Public ReadOnly Property DirectSplitCutMsg As String
+      Get
+         Return EgtMsg(91665)
+      End Get
+   End Property
+
+   Public ReadOnly Property ManageStartEndCutMsg As String
+      Get
+         Return EgtMsg(91666)
+      End Get
+   End Property
+
+   Private Property m_LayNbArrTgBtnMsg As String = "Show"
+   Public ReadOnly Property LayNbArrTgBtnMsg As String
+      Get
+         Return m_LayNbArrTgBtnMsg
+      End Get
+   End Property
+
+   Private Property m_LayNbArrTgBtnImg As String = "/Resources/NewIcons/LightArrowOn.png"
+   Public ReadOnly Property LayNbArrTgBtnImg As String
+      Get
+         Return m_LayNbArrTgBtnImg
       End Get
    End Property
 
@@ -517,6 +656,8 @@ Public Class SplitModeVM
    Sub New()
       ' Creo riferimento a questa classe in OmagOFFICEMap
       OmagOFFICEMap.SetRefSplitModeVM(Me)
+      ' leggo la configurazione
+      SetLayNbArrTgBtn_IsChecked((GetMainPrivateProfileInt(S_GENERAL, K_SHOWNBARROW, 1) <> 0))
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -525,6 +666,14 @@ Public Class SplitModeVM
 
    Friend Function InitSplitRaw() As Boolean
       m_bActive = True
+      m_bOnOffCut_IsExpanded = GetMainPrivateProfileInt("Split", "OnOffCut", 0) <> 0
+      NotifyPropertyChanged(NameOf(bOnOffCut_IsExpanded))
+      m_bSpLitCut_IsExpanded = GetMainPrivateProfileInt("Split", "SplitCut", 0) <> 0
+      NotifyPropertyChanged(NameOf(bSpLitCut_IsExpanded))
+      m_bDirectSpLitCut_IsExpanded = GetMainPrivateProfileInt("Split", "DirectSplitCut", 0) <> 0
+      NotifyPropertyChanged(NameOf(bDirectSpLitCut_IsExpanded))
+      m_bModifyCut_IsExpanded = GetMainPrivateProfileInt("Split", "ModifyCut", 0) <> 0
+      NotifyPropertyChanged(NameOf(bModifyCut_IsExpanded))
       ' aggiorno la visualizzazione dei comandi per generare i bridge
       m_BridgeBtn_IsChecked = False
       NotifyPropertyChanged(NameOf(BridgeBtn_IsChecked))
@@ -609,6 +758,8 @@ Public Class SplitModeVM
       NotifyPropertyChanged(NameOf(RemoveCut_IsChecked))
       m_CreateParallelCut_IsChecked = False
       NotifyPropertyChanged(NameOf(CreateParallelCut_IsChecked))
+      m_ModifyCut_IsChecked = False
+      NotifyPropertyChanged(NameOf(ModifyCut_IsChecked))
 
       ' Rimuovo evidenziazione e numeri
       RemoveMarkAndNumbers()
@@ -668,7 +819,7 @@ Public Class SplitModeVM
    End Sub
 
    Private Sub AddTopText(ByRef sName As String)
-      sName &= "  Top"
+      sName &= EgtMsg(91217)     '  Top
    End Sub
 
    Private Sub RemovePauseText(ByRef sName As String)
@@ -841,15 +992,15 @@ Public Class SplitModeVM
                sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
             End If
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.SAWING))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.SAWING, "/Resources/NewIcons/Movimento-manuale.png"))
          ElseIf Mach.m_nType = MCH_OY.DRILLING Then       ' Foratura
             Dim sText As String = EgtMsg(90792) & " " & i.ToString()
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.DRILLING))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.DRILLING, "/Resources/NewIcons/Foro-singolo.png"))
          ElseIf Mach.m_nType = MCH_OY.MILLING Then        ' Fresatura
             Dim sText As String = EgtMsg(90793) & " " & i.ToString()
             If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.MILLING))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.MILLING, "/Resources/NewIcons/Spianatura.png"))
          ElseIf Mach.m_nType = MCH_OY.POCKETING Then      ' Svuotatura
             Dim sText As String = EgtMsg(90796) & " " & i.ToString()
             If Mach.m_bPause Then AddPauseText(sText)
@@ -1055,6 +1206,11 @@ Public Class SplitModeVM
          ' Aggiungo a numero info con identificativo della lavorazione e viceversa
          EgtSetInfo(nNbrId, "MId", m_MachiningList(nI).m_nId)
          EgtSetInfo(m_MachiningList(nI).m_nId, "NbrId", nNbrId)
+         If Not m_LayNbArrTgBtn_IsChecked Then
+            EgtSetStatus(nNbrId, GDB_ST.OFF)
+         Else
+            EgtSetStatus(nNbrId, GDB_ST.ON_)
+         End If
       End If
       ' Se taglio con lama, metto la direzione accanto al numero
       If m_MachiningList(nI).m_nType = MCH_OY.SAWING Then
@@ -1066,6 +1222,11 @@ Public Class SplitModeVM
          ' Aggiungo a freccia info con identificativo della lavorazione e viceversa
          EgtSetInfo(nArrId, "MId", m_MachiningList(nI).m_nId)
          EgtSetInfo(m_MachiningList(nI).m_nId, "ArrId", nArrId)
+         If Not m_LayNbArrTgBtn_IsChecked Then
+            EgtSetStatus(nArrId, GDB_ST.OFF)
+         Else
+            EgtSetStatus(nArrId, GDB_ST.ON_)
+         End If
       Else
          m_MachiningList(nI).m_nArrId = GDB_ID.NULL
       End If
@@ -1182,6 +1343,13 @@ Public Class SplitModeVM
          EgtResetMark(nNbrId)
          EgtResetMark(nArrId)
       End If
+      If Not m_LayNbArrTgBtn_IsChecked And Not bMark Then
+         EgtSetStatus(nNbrId, GDB_ST.OFF)
+         EgtSetStatus(nArrId, GDB_ST.OFF)
+      Else
+         EgtSetStatus(nNbrId, GDB_ST.ON_)
+         EgtSetStatus(nArrId, GDB_ST.ON_)
+      End If
    End Sub
 
    Private Sub ColorNumberArrow(nI As Integer)
@@ -1330,11 +1498,22 @@ Public Class SplitModeVM
       End If
    End Sub
 
+   Private Sub ModifyCutIsChecked()
+      If m_CreateParallelCut_IsChecked Then
+         OmagOFFICEMap.refSceneHostVM.MainScene.SetStatusNull()
+         ResetSplitCut()
+      Else
+         ' ????????
+         ResetSplitCut()
+      End If
+   End Sub
+
+   ' Forzo la fine della creazione di un elemento SplitCut
    Private Sub ResetSplitCut()
       EgtResetMark(m_IdCurrRawSolid)
+      ResetAllMark()
       If m_IdSplitGroup <> GDB_ID.NULL Then
          EgtErase(m_IdSplitGroup)
-         EgtDraw()
       End If
       m_bGetStartPoint = False
       m_bGetEndPoint = False
@@ -1342,6 +1521,8 @@ Public Class SplitModeVM
       m_IdSplitGroup = GDB_ID.NULL
       m_IdSplitGroupLayer = GDB_ID.NULL
       m_IdCurrRawSolid = GDB_ID.NULL
+      m_IdSplitLineRemove = GDB_ID.NULL
+      EgtDraw()
    End Sub
 
    ' spegno il comando Split correntemente attivo
@@ -1350,9 +1531,18 @@ Public Class SplitModeVM
       m_RemoveCut_IsChecked = False
       m_CreateCut_IsChecked = False
       m_CreateParallelCut_IsChecked = False
+      m_ModifyCut_IsChecked = False
       NotifyPropertyChanged(NameOf(CreateCut_IsChecked))
       NotifyPropertyChanged(NameOf(CreateParallelCut_IsChecked))
       NotifyPropertyChanged(NameOf(RemoveCut_IsChecked))
+      NotifyPropertyChanged(NameOf(ModifyCut_IsChecked))
+   End Sub
+
+   Public Sub ResetAllMark()
+      For Each Item As NameIdLsBxItem In m_ItemList
+         Item.IsSelected = False
+         MarkMachining(Item.Ind, False)
+      Next
    End Sub
 
 #End Region    ' METHODS
@@ -2135,7 +2325,7 @@ Public Class SplitModeVM
             If bFirstInd Then
                Dim ModifStartWindow As New ModifStartEndCutWindowV
                Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
-               ModifStartWindowVM.Title = "Sawing"
+               ModifStartWindowVM.Title = EgtMsg(90791)  ' Sawing
                ModifStartWindow.DataContext = ModifStartWindowVM
                ModifStartWindow.Owner = Application.Current.MainWindow
                ModifStartWindowVM.SetVal(dOrigUsal)
@@ -2196,7 +2386,7 @@ Public Class SplitModeVM
             If bFirstMill Then
                Dim ModifStartWindow As New ModifStartEndCutWindowV
                Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
-               ModifStartWindowVM.Title = "Milling"
+               ModifStartWindowVM.Title = EgtMsg(90793)     ' Milling
                ModifStartWindow.DataContext = ModifStartWindowVM
                ModifStartWindow.Owner = Application.Current.MainWindow
                ModifStartWindowVM.SetVal(dOrigUsal)
@@ -2233,7 +2423,7 @@ Public Class SplitModeVM
                ' Dialogo richiesta valori
                Dim ModifStartWnd As New ModifStartEndWjWindowV
                Dim ModifStartWndVM As New ModifStartEndWjWindowVM
-               ModifStartWndVM.Title = "Water jetting"
+               ModifStartWndVM.Title = EgtMsg(90798)     ' Water jetting
                ModifStartWnd.DataContext = ModifStartWndVM
                ModifStartWnd.Owner = Application.Current.MainWindow
                ModifStartWndVM.HoleVisibility = Visibility.Visible
@@ -2319,7 +2509,7 @@ Public Class SplitModeVM
             If bFirstInd Then
                Dim ModifStartWindow As New ModifStartEndCutWindowV
                Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
-               ModifStartWindowVM.Title = "Sawing"
+               ModifStartWindowVM.Title = EgtMsg(90791)     ' Sawing
                ModifStartWindow.DataContext = ModifStartWindowVM
                ModifStartWindow.Owner = Application.Current.MainWindow
                ModifStartWindowVM.SetVal(dOrigUeal)
@@ -2374,7 +2564,7 @@ Public Class SplitModeVM
             If bFirstMill Then
                Dim ModifStartWindow As New ModifStartEndCutWindowV
                Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
-               ModifStartWindowVM.Title = "Milling"
+               ModifStartWindowVM.Title = EgtMsg(90793)     ' Milling
                ModifStartWindow.DataContext = ModifStartWindowVM
                ModifStartWindow.Owner = Application.Current.MainWindow
                ModifStartWindowVM.SetVal(dOrigUeal)
@@ -2409,7 +2599,7 @@ Public Class SplitModeVM
                ' Dialogo richiesta valori
                Dim ModifStartWnd As New ModifStartEndWjWindowV()
                Dim ModifStartWndVM As New ModifStartEndWjWindowVM
-               ModifStartWndVM.Title = "Water jetting"
+               ModifStartWndVM.Title = EgtMsg(90798)     ' Water jetting
                ModifStartWnd.DataContext = ModifStartWndVM
                ModifStartWnd.Owner = Application.Current.MainWindow
                ModifStartWndVM.HoleVisibility = Visibility.Collapsed
@@ -2817,7 +3007,7 @@ Public Class SplitModeVM
                '(m_MainWindow, m_MainWindow.m_CurrentMachine.Qualities, "Quality")
                Dim ModifyQualityWnd As New ModifyQualityV
                Dim ModifyQuality As New ModifyQualityVM
-               ModifyQuality.Title = "Quality"
+               ModifyQuality.Title = EgtMsg(91673)    ' Quality
                ModifyQuality.QualityList = CurrentMachine.Qualities
                ModifyQualityWnd.DataContext = ModifyQuality
                ModifyQualityWnd.Owner = Application.Current.MainWindow
@@ -2870,29 +3060,8 @@ Public Class SplitModeVM
       If Not String.IsNullOrEmpty(sSawing) Then
          EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       End If
-      '' Rimuovo eventuale vecchio pezzo per taglio diretto
-      'EraseDirectCutPart()
-
-      ' Disattivo eventuali lavorazioni presenti
-      ' DeactivateAllMachinings()
-
       ' Recupero pezzo per il taglio diretto
       Dim nPartId = m_IdSplitGroup
-
-      '-------------------------------------------------------------------------------------------------
-      '' Applico la correzione di spessore lama -> anche se Offset=0! ver_2.5b1
-      'Dim dTotOffset = m_dOffset
-      'If m_bSawTh Then
-      '   dTotOffset += If(m_dOffset > 0, dThick, -dThick)
-      '   EgtOffsetCurve(nCutId, dTotOffset, OFF_TYPE.EXTEND)
-      'Else
-      '   EgtOffsetCurve(nCutId, dTotOffset, OFF_TYPE.EXTEND)
-      'End If
-      '' Imposto affondamento e angolo di fianco sul taglio
-      'EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
-      'EgtSetInfo(nCutId, INFO_SIDE_ANGLE, m_dAngV)
-      '-------------------------------------------------------------------------------------------------
-
       ' Calcolo punto di inserimento nel grezzo
       Dim ptMin, ptMax As Point3d
       EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax)
@@ -2908,10 +3077,10 @@ Public Class SplitModeVM
       EgtAddPartToRawPart(nPartId, ptIns, m_IdCurrRawSolid)
       ' Inserisco la lavorazione
       bOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
-      ' Spengo la linea
-      If bOk Then
-         EgtSetStatus(m_IdSplitLine, GDB_ST.OFF)
-      End If
+      '' Spengo la linea
+      'If bOk Then
+      '   EgtSetStatus(m_IdSplitLine, GDB_ST.OFF)
+      'End If
       Return bOk
    End Function
 
@@ -2931,7 +3100,15 @@ Public Class SplitModeVM
       Return bOk
    End Function
 
+   Friend Sub OnMouseDownScene_DoubleClick(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      OnMouseDownScene(sender, e)
+      If m_nSelected = GDB_ID.NULL Then Return
+      OnOff(Nothing)
+   End Sub
+
    Friend Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Se tasto premuoto allora attivo la selezione multipla da Scena
+      Dim bKeyCtrlPressed = (Keyboard.Modifiers And ModifierKeys.Control) > 0
       ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
       If Not m_bActive OrElse OmagOFFICEMap.refMachiningTabVM.IsShow Then Return
       ' Si può selezionare solo con il tasto sinistro e se stato NULL
@@ -2997,6 +3174,7 @@ Public Class SplitModeVM
                m_IdSplitGroup = GDB_ID.NULL
                m_IdSplitGroupLayer = GDB_ID.NULL
                m_IdCurrRawSolid = GDB_ID.NULL
+               m_IdSplitLineRemove = GDB_ID.NULL
                ' Aggiorno la visualizzazione
                PreviewMachinigList()
                EgtDraw()
@@ -3050,12 +3228,48 @@ Public Class SplitModeVM
          m_IdSplitGroup = GDB_ID.NULL
          m_IdSplitGroupLayer = GDB_ID.NULL
          m_IdCurrRawSolid = GDB_ID.NULL
+         m_IdSplitLineRemove = GDB_ID.NULL
          ' Aggiorno la visualizzazione
          PreviewMachinigList()
          EgtDraw()
          Return
       End If
 
+      If m_ModifyCut_IsChecked AndAlso m_IdCurrRawSolid = GDB_ID.NULL Then
+         ' Verifico se selezionato grezzo
+         EgtSetObjFilterForSelWin(False, False, True, False, False)
+         Dim nSelRaw As Integer
+         EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelRaw)
+         Dim nIdRaw As Integer = EgtGetFirstObjInSelWin()
+         While nIdRaw <> GDB_ID.NULL
+            Dim sRawName As String = String.Empty
+            If EgtGetName(nIdRaw, sRawName) AndAlso sRawName = NAME_RAW_SOLID Then
+               m_IdCurrRawSolid = EgtGetParent(nIdRaw)
+               EgtSetMark(m_IdCurrRawSolid)
+               EgtDraw()
+               Return
+            End If
+            nIdRaw = EgtGetNextObjInSelWin()
+         End While
+         Return
+      ElseIf m_ModifyCut_IsChecked AndAlso m_IdCurrRawSolid <> GDB_ID.NULL AndAlso m_bGetStartPoint AndAlso Not m_bGetEndPoint Then
+         m_bGetEndPoint = True
+         CreateSingleCut()
+         RemoveCut(m_IdSplitLineRemove)
+         ' Resetto tutte le variabili utilizzate
+         EgtResetMark(m_IdCurrRawSolid)
+         m_bGetStartPoint = False
+         m_bGetEndPoint = False
+         m_IdSplitLine = GDB_ID.NULL
+         m_IdSplitGroup = GDB_ID.NULL
+         m_IdSplitGroupLayer = GDB_ID.NULL
+         m_IdCurrRawSolid = GDB_ID.NULL
+         m_IdSplitLineRemove = GDB_ID.NULL
+         ' Aggiorno la visualizzazione
+         PreviewMachinigList()
+         EgtDraw()
+         Return
+      End If
 
       ' Reset drag
       m_nDragInd = -1
@@ -3077,8 +3291,9 @@ Public Class SplitModeVM
             EgtDraw()
             Return
          End If
-         ' recupero le info del pezzo selezionato per procedere a generare
-         If m_CreateParallelCut_IsChecked Then
+
+         ' Recupero le info del pezzo selezionato per procedere a generare
+         If m_CreateParallelCut_IsChecked AndAlso m_IdCurrRawSolid <> GDB_ID.NULL Then
             Dim sMyName As String = ""
             EgtGetName(nId, sMyName)
             If String.Compare(sMyName, NAME_PV_CUT) = 0 Then
@@ -3095,10 +3310,62 @@ Public Class SplitModeVM
                      m_IdSplitGroupLayer = EgtCreateGroup(m_IdSplitGroup)
                      EgtSetName(m_IdSplitGroupLayer, NAME_OUTLOOP)
                      m_IdSplitLine = EgtCopyGlob(nIdLine, m_IdSplitGroupLayer)
+                     ' Recupero la dimennsione del taglio (non basta copiare la geometria)
+                     Dim dUsal As Double = 0
+                     Dim dUeal As Double = 0
+                     Dim nMchId As Integer = GDB_ID.NULL
+                     If EgtGetInfo(nPvId, "MId", nMchId) Then
+                        EgtGetInfo(nMchId, INFO_MCH_USER_SAL, dUsal)
+                        EgtGetInfo(nMchId, INFO_MCH_USER_EAL, dUeal)
+                     End If
+                     ' Aggiorno la dimensione della geometria
+                     EgtExtendCurveStartByLen(m_IdSplitLine, dUsal)
+                     EgtExtendCurveEndByLen(m_IdSplitLine, dUeal)
                      EgtDeselectObj(nId)
                      m_bGetStartPoint = True
                   End If
                End If
+               Return
+            End If
+            Return
+         End If
+
+         If m_ModifyCut_IsChecked AndAlso m_IdCurrRawSolid <> GDB_ID.NULL Then
+            Dim sMyName As String = ""
+            EgtGetName(nId, sMyName)
+            If String.Compare(sMyName, NAME_PV_CUT) = 0 Then
+               Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
+               Dim sPvId As String = String.Empty
+               EgtGetName(nPvId, sPvId)
+               If sPvId.StartsWith("Saw") Then
+                  sPvId = sPvId.Remove(0, 3)
+                  If IsNumeric(sPvId) Then
+                     Dim nIdLine As Integer = CInt(sPvId)
+                     m_IdSplitGroup = EgtCreateGroup(GDB_ID.ROOT)
+                     Dim nIdCurrMachGroup As Integer = EgtGetCurrMachGroup()
+                     EgtSetName(m_IdSplitGroup, SPLIT_CUT & "_" & nIdCurrMachGroup.ToString & "." & EgtGetCurrPhase())
+                     m_IdSplitGroupLayer = EgtCreateGroup(m_IdSplitGroup)
+                     EgtSetName(m_IdSplitGroupLayer, NAME_OUTLOOP)
+                     m_IdSplitLine = EgtCopyGlob(nIdLine, m_IdSplitGroupLayer)
+                     ' Recupero la dimennsione del taglio (non basta copiare la geometria)
+                     Dim dUsal As Double = 0
+                     Dim dUeal As Double = 0
+                     Dim nMchId As Integer = GDB_ID.NULL
+                     If EgtGetInfo(nPvId, "MId", nMchId) Then
+                        EgtGetInfo(nMchId, INFO_MCH_USER_SAL, dUsal)
+                        EgtGetInfo(nMchId, INFO_MCH_USER_EAL, dUeal)
+                     End If
+                     ' Aggiorno la dimensione della geometria
+                     EgtExtendCurveStartByLen(m_IdSplitLine, dUsal)
+                     EgtExtendCurveEndByLen(m_IdSplitLine, dUeal)
+                     EgtDeselectObj(nId)
+                     ' Salvo l'Id del tagli da eliminare
+                     m_IdSplitLineRemove = nId
+                     m_bGetStartPoint = True
+                     EgtDraw()
+                  End If
+               End If
+               Return
             End If
             Return
          End If
@@ -3168,7 +3435,14 @@ Public Class SplitModeVM
       If m_nSelected >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
          Dim nItemIndex = 0
          For Each Item In ItemList
-            Item.IsSelected = (nItemIndex = m_nSelected)
+            If Not bKeyCtrlPressed Then
+               Item.IsSelected = (nItemIndex = m_nSelected)
+            Else
+               ' procedo ad rendere attivo solo l'elemnento selezionato
+               If nItemIndex = m_nSelected Then
+                  Item.IsSelected = True
+               End If
+            End If
             nItemIndex += 1
          Next
       Else
@@ -3224,6 +3498,15 @@ Public Class SplitModeVM
          EgtDraw()
       End If
 
+      If m_ModifyCut_IsChecked AndAlso m_IdSplitLine <> GDB_ID.NULL Then
+         Dim mPoint3d As Point3d
+         EgtMidPoint(m_IdSplitLine, mPoint3d)
+         mPoint3d.z = 0
+         ptCurr.z = 0
+         EgtMove(m_IdSplitLine, ptCurr - mPoint3d)
+         EgtDraw()
+      End If
+
       ' Se drag non abilitato o in corso
       If m_nDragInd = -1L Or m_bDragging Then Return
       m_bDragging = True
@@ -3322,6 +3605,20 @@ Public Class SplitModeVM
          DeselectWJBridgesPart()
       End If
    End Sub
+
+   Friend Sub StatusOffNumbArrow(Status As GDB_ST)
+      For Each Item In m_MachiningList
+         Dim nOperId As Integer = Item.m_nId
+         Dim nNbrId As Integer = Item.m_nNbrId
+         Dim nArrId As Integer = Item.m_nArrId
+         Dim nInd As Integer = m_MachiningList.IndexOf(Item)
+         If nInd >= 0 AndAlso nInd < m_ItemList.Count AndAlso Not m_ItemList(nInd).IsSelected Then
+            EgtSetStatus(nNbrId, Status)
+            EgtSetStatus(nArrId, Status)
+         End If
+      Next
+      EgtDraw()
+   End Sub
 #End Region    ' EVENTS
 
    '-----------------------------------------------------------------------------------------------
@@ -3330,6 +3627,7 @@ Public Class SplitModeVM
 
       Private m_nInd As Integer
       Private m_sName As String
+      Private m_sSourceImg As String
       Private m_bIsActive As Boolean
       Private m_nType As Integer
 
@@ -3354,6 +3652,16 @@ Public Class SplitModeVM
          End Set
       End Property
 
+      Public Property SourceImg As String
+         Get
+            Return m_sSourceImg
+         End Get
+         Set(value As String)
+            m_sSourceImg = value
+            NotifyPropertyChanged("SourceImg")
+         End Set
+      End Property
+
       Public Property bIsActive As Boolean
          Get
             Return m_bIsActive
@@ -3479,6 +3787,14 @@ Public Class SplitModeVM
          Me.m_nType = nType
       End Sub
 
+      Sub New(Name As String, Ind As Integer, bIsActive As Boolean, nType As Integer, sImg As String)
+         Me.m_sName = Name
+         Me.m_nInd = Ind
+         Me.m_bIsActive = bIsActive
+         Me.m_nType = nType
+         Me.m_sSourceImg = sImg
+      End Sub
+
    End Class
 
 End Class

OptionPanel/NestingTab/ChangeTableV.xaml

@@ -0,0 +1,63 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="ChangeTableV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"                    
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen"
+                            CloseCommand="{Binding CloseCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"                   
+                            Title="{Binding sTitle}" Height="150" Width="320">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="2*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <ItemsControl ItemsSource="{Binding CurrTableList}">
+         <!--Definisco l'organizzazione dei comandi-->
+         <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+               <StackPanel Orientation="Horizontal" 
+                           HorizontalAlignment="Center" 
+                           VerticalAlignment="Center"/>
+            </ItemsPanelTemplate>
+         </ItemsControl.ItemsPanel>
+         <!--Definisco il contenuto del comando-->
+         <ItemsControl.ItemTemplate>
+            <DataTemplate>
+               <RadioButton GroupName="TabGrp" 
+                            IsChecked="{Binding IsActive}"
+                            Width="60" Height="60"
+                            Style="{DynamicResource ChangeTable_ToggleButton}">
+                  <Grid>
+                     <!--Nome della tavole: Tab #-->
+                     <TextBlock Text="{Binding sName}" 
+                                HorizontalAlignment="Center"
+                                Background="Transparent">
+                        <TextBlock.Style>
+                           <Style TargetType="{x:Type TextBlock}">
+                              <Setter Property="Foreground" Value="{StaticResource Omag_LightGray}"/>
+                              <Style.Triggers>
+                                 <DataTrigger Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=RadioButton}}" Value="True">
+                                    <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                                 </DataTrigger>
+                              </Style.Triggers>
+                           </Style>
+                        </TextBlock.Style>
+                     </TextBlock>
+                     <!--Rappresentazione di una tavola di lavoro-->
+                     <Image Source="{Binding ImgTab}" Margin="0,20,0,0"/>
+                  </Grid>
+
+               </RadioButton>
+            </DataTemplate>
+         </ItemsControl.ItemTemplate>
+      </ItemsControl>
+      <UniformGrid Grid.Row="1" Columns="2">
+         <Button Content="Ok" Margin="5" Command="{Binding OkCommand}"
+                 Style="{StaticResource OptionPanel_TextButton}"/>
+         <Button Content="Cancel" Margin="5" Command="{Binding CancelCommand}"
+                 Style="{StaticResource OptionPanel_TextButton}"/>
+      </UniformGrid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

OptionPanel/NestingTab/ChangeTableV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class ChangeTableV
+
+End Class

OptionPanel/NestingTab/ChangeTableVM.vb

@@ -0,0 +1,143 @@
+Public Class ChangeTableVM
+   Inherits VMBase
+   Private m_refChanTableV As ChangeTableV
+
+   Public Enum EnumDialogResult
+      OK
+      CANCEL
+   End Enum
+
+   Private m_MyDialogResult As EnumDialogResult
+   Public ReadOnly Property MyDialogResult As EnumDialogResult
+      Get
+         Return m_MyDialogResult
+      End Get
+   End Property
+
+   Private m_sTitle As String = "Seleziona tavola di lavoro"
+   Public ReadOnly Property sTitle As String
+      Get
+         Return m_sTitle
+      End Get
+   End Property
+
+   Private m_nSelectedTable As Integer = 0
+   Public ReadOnly Property nSelectedTable As Integer
+      Get
+         Return m_nSelectedTable
+      End Get
+   End Property
+
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+   Sub New(refV As ChangeTableV)
+      m_refChanTableV = refV
+      ' Procedo alla creazione della lista delle tavole disponibili
+      Initialized()
+   End Sub
+
+   Private m_CurrTableList As New List(Of TableToChange)
+   Public ReadOnly Property CurrTableList As List(Of TableToChange)
+      Get
+         Return m_CurrTableList
+      End Get
+   End Property
+
+   Private Sub Initialized()
+      ' recuepero l'inidce della tavola corrente
+      Dim nIndeXCurrTab As Integer = GetCurrentTable()
+      ' creo la lista delle tavole disponibili (attivo il bottone della tavola attualmente in uso)
+      For nInd As Integer = 0 To GetTableCount() - 1
+         m_CurrTableList.Add(New TableToChange("Tab", (nInd + 1), ((nInd + 1) = nIndeXCurrTab)))
+      Next
+   End Sub
+
+   Public ReadOnly Property OkCommand() As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public ReadOnly Property CancelCommand() As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Private Sub Ok()
+      ' recupero l'indice della tavola impostata
+      For Each ItemTab As TableToChange In CurrTableList
+         If ItemTab.IsActive Then
+            m_nSelectedTable = ItemTab.nIndex
+            Exit For
+         End If
+      Next
+      m_MyDialogResult = EnumDialogResult.OK
+      ' procedo alla chiusura della finetra
+      m_refChanTableV.Close()
+   End Sub
+
+   Private Sub Cancel()
+      m_MyDialogResult = EnumDialogResult.CANCEL
+      ' procedo alla chiusura della finetra
+      m_refChanTableV.Close()
+   End Sub
+
+End Class
+
+Public Class TableToChange
+   Inherits VMBase
+
+   Private Property m_sName As String = "Tab"
+   Public ReadOnly Property sName As String
+      Get
+         Return m_sName
+      End Get
+   End Property
+
+   Private m_sImgTab As String = "\Resources\NewIcons\table.png"
+   Public ReadOnly Property ImgTab As String
+      Get
+         Return If(m_bIsActive, "\Resources\NewIcons\table.png", "\Resources\NewIcons\tableS.png")
+      End Get
+   End Property
+
+   Private Property m_nIndex As Integer = 3
+   Public ReadOnly Property nIndex As Integer
+      Get
+         Return m_nIndex
+      End Get
+   End Property
+
+   Private m_bIsActive As Boolean = False
+   Public Property IsActive As Boolean
+      Get
+         Return m_bIsActive
+      End Get
+      Set(value As Boolean)
+         m_bIsActive = value
+         If m_bIsActive Then
+            m_sImgTab = "\Resources\NewIcons\table.png"
+         Else
+            m_sImgTab = "\Resources\NewIcons\tableS.png"
+         End If
+         NotifyPropertyChanged(NameOf(IsActive))
+         NotifyPropertyChanged(NameOf(ImgTab))
+      End Set
+   End Property
+
+   Public Sub New(Name As String, Ind As Integer, IsCurrent As Boolean)
+      m_sName = Name & " " & Ind.ToString
+      m_nIndex = Ind
+      m_bIsActive = IsCurrent
+      NotifyPropertyChanged("IsActive")
+   End Sub
+
+End Class

OptionPanel/NestingTab/MultiSelectionVM.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class MultiSelectionVM
    Inherits VMBase
@@ -8,24 +7,24 @@ Public Class MultiSelectionVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return "Multiple selection"
+         Return EgtMsg(91681)    ' Multiple selection
       End Get
    End Property
    Public ReadOnly Property SelectionMsg As String
       Get
-         Return "Number of Parts"
+         Return EgtMsg(91682)    ' Number of Parts
       End Get
    End Property
 
    Public ReadOnly Property OkMsg As String
       Get
-         Return "Ok"
+         Return EgtMsg(91651)    ' Ok
       End Get
    End Property
 
    Public ReadOnly Property CancelMsg As String
       Get
-         Return "Cancel"
+         Return EgtMsg(91652)    ' Cancel
       End Get
    End Property
 

OptionPanel/NestingTab/NestingTabV.xaml

@@ -5,7 +5,7 @@
    Margin="5,5,5,0">
 
 
-    <GroupBox Header="Disegno parametrico" Style="{StaticResource GroupBoxSplit}">
+    <GroupBox Header="{Binding DrawingMsg}" Style="{StaticResource GroupBoxSplit}">
         <Grid HorizontalAlignment="Center"
          VerticalAlignment="Center" Margin="0,2.5,0,0">
             <Grid.ColumnDefinitions>
@@ -144,11 +144,15 @@
 
     </Border>
 
+    <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+        <Expander Name="myExpander1" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding ManagePartsMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bManageParts_IsExpanded}">
 
-    <GroupBox Header="Gestione parcheggio" Style="{StaticResource GroupBoxSplit}">
-
-        <UniformGrid Grid.Column="0" Columns="3" Margin="0,2.5,0,0">
-            <!--<Button Content="{Binding InsertPartMsg}"
+            <UniformGrid Grid.Column="0" Columns="3" Margin="0,2.5,0,0">
+                <!--<Button Content="{Binding InsertPartMsg}"
                 Style="{StaticResource OptionPanel_TextButton}"
                 Command="{Binding InsertPartCommand}"
                 Margin="0,0,2.5,0"/>
@@ -157,156 +161,168 @@
                 Style="{StaticResource OptionPanel_TextButton}"
                 Command="{Binding StorePartCommand}"
                 Margin="2.5,0,0,0"/>-->
-            <StackPanel>
-                <Button ToolTip="{Binding InsertPartMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding InsertPartMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding InsertPartCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Inserisci-pezzo.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Inserisci-pezzo.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding InsertPartMsg}"
+                            <!--<TextBlock Text="{Binding InsertPartMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <Button ToolTip="{Binding StorePartMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding StorePartMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding StorePartCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Parcheggia-pezzo.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Parcheggia-pezzo.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding StorePartMsg}"
+                            <!--<TextBlock Text="{Binding StorePartMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <Button ToolTip="{Binding RemovePartMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding RemovePartMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding RemovePartCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Elimina-pezzo.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Elimina-pezzo.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding RemovePartMsg}"
+                            <!--<TextBlock Text="{Binding RemovePartMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
+                <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
                 Visibility="{Binding StartCurvWJ_Visibility}"         
                 Style="{StaticResource OptionPanel_ToggleButton}"
                 IsChecked="{Binding bStartCurvWJ}"
                 Margin="2.5,0,2.5,0"/>-->
-        </UniformGrid>
+            </UniformGrid>
+        </Expander>
+    </Border>
 
-    </GroupBox>
+    <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+        <Expander Name="myExpander2" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding SelectionPartMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bSelectionParts_IsExpanded}">
 
-    <GroupBox Header="Gestione selezione" Style="{StaticResource GroupBoxSplit}">
+            <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,2.5,0,0">
 
-        <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,2.5,0,0">
-
-            <StackPanel>
-                <Button ToolTip="{Binding SelectAllMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding SelectAllMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding SelectAllCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="2.5,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Seleziona-tutto.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Seleziona-tutto.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding SelectAllMsg}"
+                            <!--<TextBlock Text="{Binding SelectAllMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <Button ToolTip="{Binding DeselectAllMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding DeselectAllMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding DeselectAllCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="2.5,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Deseleziona-tutto.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Deseleziona-tutto.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding DeselectAllMsg}"
+                            <!--<TextBlock Text="{Binding DeselectAllMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <ToggleButton ToolTip="{Binding DragRectangleMsg}" Grid.Column="1"
+                <StackPanel>
+                    <ToggleButton ToolTip="{Binding DragRectangleMsg}" Grid.Column="1"
                  Visibility="{Binding DragRectangle_Visibility}"
                  Style="{StaticResource Nest_ToggleButton_Img}"
                  IsChecked="{Binding bDragRectangle}"
                  HorizontalContentAlignment="Stretch"
                  Margin="2.5,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Drag_Rettangle.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Drag_Rettangle.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding DragRectangleMsg}"
+                            <!--<TextBlock Text="{Binding DragRectangleMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </ToggleButton>
-            </StackPanel>
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
 
-        </UniformGrid>
-    </GroupBox>
+            </UniformGrid>
+        </Expander>
+    </Border>
 
-    <GroupBox Header="Gestione tgali WJ" Style="{StaticResource GroupBoxSplit}" Visibility="{Binding WJ_Cmd_Visibility}">
-        <UniformGrid Grid.Column="0" Columns="2" Margin="2.5,0,0,0" Visibility="{Binding WJ_Cmd_Visibility}">
-
-            <StackPanel HorizontalAlignment="Right" Margin="0,0,3.75,0">
-                <ToggleButton ToolTip="{Binding SplitCurvWJMsg}" Grid.Column="1"
+    <Border Style="{StaticResource Border}" Margin="0,1,0,5" Visibility="{Binding WJ_Cmd_Visibility}">
+        <Expander Name="myExpander3" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding ManageWJMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bManageWJ_IsExpanded}">
+            <UniformGrid Grid.Column="0" Columns="2" Margin="2.5,0,0,0" Visibility="{Binding WJ_Cmd_Visibility}">
+                <StackPanel HorizontalAlignment="Right" Margin="0,0,3.75,0">
+                    <ToggleButton ToolTip="{Binding SplitCurvWJMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_ToggleButton_Img}"
                  IsChecked="{Binding bSplitCurvWJ}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/SPLIT-WJ.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/SPLIT-WJ.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding SplitCurvWJMsg}"
+                            <!--<TextBlock Text="{Binding SplitCurvWJMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </ToggleButton>
-            </StackPanel>
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
 
-            <StackPanel HorizontalAlignment="Left" Margin="3.75,0,0,0">
-                <ToggleButton ToolTip="{Binding StartCurvWJMsg}" Grid.Column="1"
+                <StackPanel HorizontalAlignment="Left" Margin="3.75,0,0,0">
+                    <ToggleButton ToolTip="{Binding StartCurvWJMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_ToggleButton_Img}"
                  IsChecked="{Binding bStartCurvWJ}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/START-WJ.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/START-WJ.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding StartCurvWJMsg}"
+                            <!--<TextBlock Text="{Binding StartCurvWJMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </ToggleButton>
-            </StackPanel>
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
+
+            </UniformGrid>
+        </Expander>
+    </Border>
 
-        </UniformGrid>
-    </GroupBox>
 
     <Button Content="{Binding ResetMsg}"
            Style="{StaticResource OptionPanel_TextButton}"

OptionPanel/NestingTab/NestingTabVM.vb

@@ -1,5 +1,6 @@
 Imports EgtWPFLib5
 Imports EgtUILib
+Imports OmagOFFICE.ChangeTableVM
 
 Public Class NestingTabVM
    Inherits VMBase
@@ -169,6 +170,42 @@ Public Class NestingTabVM
       End Get
    End Property
 
+   Private m_bManageParts_IsExpanded As Boolean = True
+   Public Property bManageParts_IsExpanded As Boolean
+      Get
+         Return m_bManageParts_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bManageParts_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bManageParts_IsExpanded))
+         WriteMainPrivateProfileString("Nest", "ManageParts", If(m_bManageParts_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bSelectionParts_IsExpanded As Boolean = True
+   Public Property bSelectionParts_IsExpanded As Boolean
+      Get
+         Return m_bSelectionParts_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bSelectionParts_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bSelectionParts_IsExpanded))
+         WriteMainPrivateProfileString("Nest", "SelectionParts", If(m_bSelectionParts_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bManageWJ_IsExpanded As Boolean = True
+   Public Property bManageWJ_IsExpanded As Boolean
+      Get
+         Return m_bManageWJ_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bManageWJ_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bManageWJ_IsExpanded))
+         WriteMainPrivateProfileString("Nest", "ManageWJ", If(m_bManageWJ_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property InsertPartMsg As String
@@ -191,7 +228,7 @@ Public Class NestingTabVM
 
    Public ReadOnly Property DragRectangleMsg As String
       Get
-         Return "Drag Rectangle"
+         Return EgtMsg(91670)
       End Get
    End Property
 
@@ -233,8 +270,54 @@ Public Class NestingTabVM
       End Get
    End Property
 
+   Public ReadOnly Property DrawingMsg As String
+      Get
+         Return EgtMsg(91657)
+      End Get
+   End Property
+
+   Public ReadOnly Property ManagePartsMsg As String
+      Get
+         Return EgtMsg(91660)
+      End Get
+   End Property
+
+   Public ReadOnly Property SelectionPartMsg As String
+      Get
+         Return EgtMsg(91661)
+      End Get
+   End Property
+
+   Public ReadOnly Property ManageWJMsg As String
+      Get
+         Return EgtMsg(91662)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
+#Region "ToolTip"
+
+   Public ReadOnly Property ParametricToolTip As String
+      Get
+         Return EgtMsg(91657)
+      End Get
+   End Property
+
+   Public ReadOnly Property ImportDrawToolTip As String
+      Get
+         Return EgtMsg(91658)
+      End Get
+   End Property
+
+   Public ReadOnly Property ImportCSVToolTip As String
+      Get
+         Return EgtMsg(91659)
+      End Get
+   End Property
+
+#End Region    ' ToolTip
+
    ' Definizione comandi
    Private m_cmdDraw As ICommand
    Private m_cmdImportDxf As ICommand
@@ -276,6 +359,12 @@ Public Class NestingTabVM
 #Region "METHODS"
 
    Friend Function InitNesting() As Boolean
+      m_bManageParts_IsExpanded = GetMainPrivateProfileInt("Nest", "ManageParts", 0) <> 0
+      NotifyPropertyChanged(NameOf(bManageParts_IsExpanded))
+      m_bSelectionParts_IsExpanded = GetMainPrivateProfileInt("Nest", "SelectionParts", 0) <> 0
+      NotifyPropertyChanged(NameOf(bSelectionParts_IsExpanded))
+      m_bManageWJ_IsExpanded = GetMainPrivateProfileInt("Nest", "ManageWJ", 0) <> 0
+      NotifyPropertyChanged(NameOf(bManageWJ_IsExpanded))
       ' Se previsto, abilito bottone VeinMatching
       If Not IsNothing(OmagOFFICEMap.refMainWindowVM.VeinMatchingWnd) Then
          OmagOFFICEMap.refVeinMatchPanelVM.VeinMatchIsEnabled = True
@@ -319,6 +408,8 @@ Public Class NestingTabVM
          m_CsvImportWindow = New CsvWindowV(Application.Current.MainWindow, New CsvWindowVM)
          m_CsvImportWindow.Show()
       End If
+      ' Per sicurezza spengo la visualizzazione di tutti i percorsi di lavorazione
+      HideAllMachinings()
       EgtZoom(ZM.ALL)
       Return True
    End Function
@@ -494,6 +585,208 @@ Public Class NestingTabVM
       m_bStartRot = False
    End Sub
 
+   Friend Function RotateAllRawParts(dAngDeg As Double, Optional bIsReg As Boolean = True) As Boolean
+      ' Recupero rotazione totale
+      Dim dRegRot As Double = CamAuto.GetRegistrationRotation()
+      ' Recupero il centro del grezzo iniziale per usarlo come centro della rotazione
+      Dim ptCen As New Point3d
+      GetRawCenter(ptCen)
+      ' Provo la rotazione
+      Dim bMoveOk As Boolean = True
+      Dim nPhase As Integer = 1
+      Dim nRawId As Integer = GDB_ID.NULL
+      While nPhase <= EgtGetPhaseCount()
+         EgtSetCurrPhase(nPhase)
+         nRawId = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            If EgtVerifyRawPartPhase(nRawId, nPhase) Then
+               ' Rotazione del centro come spostamento grezzo più rotazione grezzo attorno al suo centro
+               Dim ptRawCen As New Point3d
+               EgtGetRawPartCenter(nRawId, ptRawCen)
+               Dim ptMovCen As New Point3d(ptRawCen)
+               ptMovCen.Rotate(ptCen, Vector3d.Z_AX(), dAngDeg)
+               If Not EgtMoveRawPart(nRawId, ptMovCen - ptRawCen) Then
+                  bMoveOk = False
+                  Exit While
+               End If
+               If Not EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngDeg) Then
+                  EgtMoveRawPart(nRawId, -(ptMovCen - ptRawCen))
+                  bMoveOk = False
+                  Exit While
+               End If
+            End If
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+         If Not bMoveOk Then Exit While
+         nPhase += 1
+      End While
+      ' Se rotazione impossibile, ripristino posizione dei grezzi già spostati
+      If Not bMoveOk Then
+         Dim nRevPhase As Integer = 1
+         Dim nRevRawId As Integer = GDB_ID.NULL
+         While nRevPhase <= nPhase
+            EgtSetCurrPhase(nRevPhase)
+            nRevRawId = EgtGetFirstRawPart()
+            While nRevRawId <> GDB_ID.NULL And (nRevPhase < nPhase Or nRevRawId <> nRawId)
+               If EgtVerifyRawPartPhase(nRevRawId, nRevPhase) Then
+                  ' Eseguo al contrario
+                  EgtRotateRawPart(nRevRawId, Vector3d.Z_AX(), -dAngDeg)
+                  Dim ptRawCen As New Point3d
+                  EgtGetRawPartCenter(nRevRawId, ptRawCen)
+                  Dim ptMovCen As New Point3d(ptRawCen)
+                  ptMovCen.Rotate(ptCen, Vector3d.Z_AX(), -dAngDeg)
+                  EgtMoveRawPart(nRevRawId, (ptMovCen - ptRawCen))
+               End If
+               nRevRawId = EgtGetNextRawPart(nRevRawId)
+            End While
+            nRevPhase += 1
+         End While
+         ' Altrimenti eseguo sistemazioni
+      Else
+         ' Origine della tavola
+         Dim ptOri As Point3d
+         EgtGetTableRef(1, ptOri)
+         ' Annullo rotazioni dei grezzi e le rifaccio sulle parti componenti
+         Dim nRevPhase As Integer = 1
+         Dim nRevRawId As Integer = GDB_ID.NULL
+         While nRevPhase <= EgtGetPhaseCount()
+            EgtSetCurrPhase(nRevPhase)
+            nRevRawId = EgtGetFirstRawPart()
+            While nRevRawId <> GDB_ID.NULL
+               If EgtVerifyRawPartPhase(nRevRawId, nRevPhase) Then
+                  ' Eseguo al contrario
+                  EgtRotateRawPart(nRevRawId, Vector3d.Z_AX(), -dAngDeg)
+                  Dim ptRawCen As New Point3d
+                  EgtGetRawPartCenter(nRevRawId, ptRawCen)
+                  Dim ptMovCen As New Point3d(ptRawCen)
+                  ptMovCen.Rotate(ptCen, Vector3d.Z_AX(), -dAngDeg)
+                  EgtMoveRawPart(nRevRawId, (ptMovCen - ptRawCen))
+                  ' Rifaccio sugli oggetti contenuti nel grezzo
+                  Dim nId As Integer = EgtGetFirstInGroup(nRevRawId)
+                  While nId <> GDB_ID.NULL
+                     EgtRotate(nId, ptCen, Vector3d.Z_AX(), dAngDeg, GDB_RT.GLOB)
+                     nId = EgtGetNext(nId)
+                  End While
+                  ' Imposto posizione esatta del grezzo dopo rotazione
+                  Dim b3Raw As New BBox3d
+                  EgtGetRawPartBBox(nRevRawId, b3Raw)
+                  EgtMoveToCornerRawPart(nRevRawId, (b3Raw.Min() - ptOri) + Point3d.ORIG(), MCH_CR.BL)
+               End If
+               nRevRawId = EgtGetNextRawPart(nRevRawId)
+            End While
+            nRevPhase += 1
+         End While
+         ' Ruoto opportunamente anche i dati di movimento
+         Dim nOpeId As Integer = EgtGetFirstActiveOperation()
+         While nOpeId <> GDB_ID.NULL
+            If EgtGetOperationType(nOpeId) = MCH_OY.DISP Then
+               ' Recupero i gruppi con i dati
+               Dim nRpmId As Integer = EgtGetFirstNameInGroup(nOpeId, "Rpm*")
+               While nRpmId <> GDB_ID.NULL
+                  ' Recupero le informazioni
+                  Dim vtRawMove As New Vector3d
+                  If EgtGetInfo(nRpmId, "Mv", vtRawMove) Then
+                     vtRawMove.Rotate(Vector3d.Z_AX(), dAngDeg)
+                     EgtSetInfo(nRpmId, "Mv", vtRawMove)
+                  End If
+                  Dim vtDelta As New Vector3d
+                  If EgtGetInfo(nRpmId, "Dt", vtDelta) Then
+                     vtDelta.Rotate(Vector3d.Z_AX(), dAngDeg)
+                     EgtSetInfo(nRpmId, "Dt", vtDelta)
+                  End If
+                  Dim dAngRotDeg As Double = 0
+                  If EgtGetInfo(nRpmId, "Ad", dAngRotDeg) Then
+                     EgtSetInfo(nRpmId, "Ad", dAngRotDeg + dAngDeg)
+                  End If
+                  ' Cerco un altro gruppo
+                  nRpmId = EgtGetNextName(nRpmId, "Rpm*")
+               End While
+            End If
+            nOpeId = EgtGetNextActiveOperation(nOpeId)
+         End While
+         ' Se non è registrazione, ruoto anche l'eventuale foto della lastra
+         'If Not bIsReg Then
+         '   Dim nPhotoId = m_CurrProjPage.GetPhoto()
+         '   If nPhotoId <> GDB_ID.NULL then EgtRotatePhoto(nPhotoId, ptCen, Vector3d.Z_AX(), dAngDeg)
+         'End If
+         ' Aggiorno rotazione totale
+         If bIsReg Then
+            CamAuto.SetRegistrationRotation(dRegRot + dAngDeg)
+         Else
+            CamAuto.SetRegistrationRotation(0)
+         End If
+         ' Dichiaro grezzo per punti
+         EgtSetInfo(GetCurrentRaw(), KEY_RAWBYPOINTS, 1)
+      End If
+      ' Ruoto i punti SpotReg disegnati in Office
+      If bMoveOk Then
+         RotateAllSpotRegistration(dAngDeg, ptCen)
+      End If
+      ' Ripristino lo stato iniziale
+      EgtSetCurrPhase(1)
+      HideAllMachinings()
+      Return bMoveOk
+   End Function
+
+   ' Ruoto solo gli elementi SpotReg creati nel programma OFFICE
+   Private Sub RotateAllSpotRegistration(dAngRot As Double, ptCen As Point3d)
+      Dim nId As Integer = EgtGetFirstInGroup(OmagOFFICEMap.refRawPartTabVM.m_nRegGroupId)
+      While nId <> GDB_ID.NULL
+         Dim sName As String = String.Empty
+         EgtGetName(nId, sName)
+         If Not sName.Contains("CUT") Then
+            EgtRotate(nId, ptCen, Vector3d.Z_AX, dAngRot)
+         End If
+         nId = EgtGetNext(nId)
+      End While
+      EgtDraw()
+   End Sub
+
+   Private Sub MoveAllRawParts(vtMove As Vector3d)
+      ' Provo il movimento
+      Dim bMoveOk As Boolean = True
+      Dim nPhase As Integer = 1
+      Dim nRawId As Integer = GDB_ID.NULL
+      While nPhase <= EgtGetPhaseCount()
+         EgtSetCurrPhase(nPhase)
+         nRawId = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            If EgtVerifyRawPartPhase(nRawId, nPhase) Then
+               If Not EgtMoveRawPart(nRawId, vtMove) Then
+                  bMoveOk = False
+                  Exit While
+               End If
+            End If
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+         If Not bMoveOk Then Exit While
+         nPhase += 1
+      End While
+      ' Se movimento impossibile, ripristino posizione dei grezzi già spostati
+      If Not bMoveOk Then
+         Dim nRevPhase As Integer = 1
+         Dim nRevRawId As Integer = GDB_ID.NULL
+         While nRevPhase <= nPhase
+            EgtSetCurrPhase(nRevPhase)
+            nRevRawId = EgtGetFirstRawPart()
+            While nRevRawId <> GDB_ID.NULL And (nRevPhase < nPhase Or nRevRawId <> nRawId)
+               If EgtVerifyRawPartPhase(nRevRawId, nRevPhase) Then
+                  EgtMoveRawPart(nRevRawId, -vtMove)
+               End If
+               nRevRawId = EgtGetNextRawPart(nRevRawId)
+            End While
+            nRevPhase += 1
+         End While
+      End If
+      ' Muovo i punti SpotReg generati nel programma OFFICE
+      If bMoveOk Then
+         OmagOFFICEMap.refRawPartTabVM.MoveAllSpotRegistration(vtMove)
+      End If
+      ' Ripristino lo stato iniziale
+      EgtSetCurrPhase(1)
+      HideAllMachinings()
+   End Sub
+
    ' verifica che la rotazione sia ammessa
    Private Function RotatePartInsideBond(dAngRotDeg As Double, nIdMove As Integer) As Boolean
       ' Verifico se ci sono dei pezzi bloccati in rotazione
@@ -2114,6 +2407,8 @@ Public Class NestingTabVM
       While nId <> GDB_ID.NULL
          ' Recupero l'identificativo del pezzo cui appartiene
          Dim nPartId As Integer = EgtGetParent(EgtGetParent(nId))
+         Dim sNamePartId As String = String.Empty
+         EgtGetName(nPartId, sNamePartId)
          Dim bPartInTable As Boolean = (EgtGetParent(nPartId) = GetRawId())
          If EgtIsPart(nPartId) Or bPartInTable Then
             Dim nStat As Integer = GDB_ST.ON_
@@ -2151,6 +2446,102 @@ Public Class NestingTabVM
             ' Drag possibile
             m_bDrag = True
             Exit While
+
+         Else
+            ' verifico se l'elemento selezionato è il nome della tavola
+            If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or
+                                                          sNamePartId = SECOND_TAB Or
+                                                          sNamePartId = THIRD_TAB Or
+                                                          sNamePartId = FORTH_TAB) Then
+
+               ' Apro la finestra per la selezione della tavola da usare
+               Dim ChgTbV As New ChangeTableV
+               Dim ChgTbVM As New ChangeTableVM(ChgTbV)
+               ChgTbV.DataContext = ChgTbVM
+               ChgTbV.ShowDialog()
+
+               ' se non è stata eseguita nessuna scelta esco dal ciclo 
+               If ChgTbVM.MyDialogResult = EnumDialogResult.CANCEL Or ChgTbVM.nSelectedTable = 0 Then Exit While
+
+               ' recupero il nome della tavola corrente
+               Dim sOtherTab As String = GetTableName(ChgTbVM.nSelectedTable)
+
+               EgtChangeTable(sOtherTab, True)
+               EstCalc.AdjustAdditionalTable(True)
+               EgtSetMachineLook(MCH_LOOK.TAB)
+               ' aggiorno le lavorazioni
+               UpdateAllMachiningsToolpaths()
+               ' aggiorno i movimenti pezzi tra disposizioni
+               For nI As Integer = 1 To EgtGetPhaseCount()
+                  EgtSetCurrPhase(nI)
+                  Dim nDispId As Integer = EgtGetPhaseDisposition(nI)
+                  SpecialApplyDisposition(nDispId, True)
+               Next
+               ' aggiorno posizionamento ventose per lavorazioni da sotto
+               UpdateVacuumsForDrip()
+               ' dichiaro tutto aggiornato
+               EstCalc.SetOrderMachiningFlag()
+               EgtSetCurrPhase(1)
+               ' aggiorno posizione pezzi in parcheggio
+               Dim nPPId As Integer = EgtGetFirstPart()
+               While nPPId <> GDB_ID.NULL
+                  PackPartInStore(nPPId)
+                  nPPId = EgtGetNextPart(nPPId)
+               End While
+               ' se prevista rotazione
+               If GetPrivateProfileInt(S_TABLE, K_CHANGETABWD, 0, CurrentMachine.sMachIniFile) = 2 Then
+                  ' Dati tavola
+                  Dim b3Tab As New BBox3d
+                  EgtGetTableArea(1, b3Tab)
+                  ' Box lastra
+                  Dim b3OrigRaw As New BBox3d
+                  GetRawBox(b3OrigRaw)
+                  ' Allargo i limiti della tavola in tutte le fasi
+                  Const TAB_OFFS As Double = 3000
+                  For nI As Integer = 1 To EgtGetPhaseCount()
+                     EgtSetCurrPhase(nI)
+                     EgtSetTableAreaOffset(TAB_OFFS, TAB_OFFS, TAB_OFFS, TAB_OFFS)
+                  Next
+                  ' aggiorno posizionamento ventose per lavorazioni da sotto
+                  UpdateVacuumsForDrip()
+                  ' dichiaro tutto aggiornato
+                  EstCalc.SetOrderMachiningFlag()
+                  EgtSetCurrPhase(1)
+                  ' Rotazione
+                  Dim dAngRot As Double = If(sOtherTab = SECOND_TAB, 180, -180)
+                  If Not RotateAllRawParts(dAngRot, False) Then
+                     'm_CurrProjPage.SetWarningMessage(EgtMsg(90339))        'Rotazione impossibile
+                  End If
+                  ' Traslazione per riportare la lastra nella stessa posizione rispetto all'angolo BL che diveta TR e viceversa
+                  Dim b3Raw As New BBox3d
+                  GetRawBox(b3Raw)
+                  Dim vtMove As Vector3d
+                  If sOtherTab = SECOND_TAB Then
+                     Dim vtDiffIni As Vector3d = b3OrigRaw.Min() - b3Tab.Min()
+                     Dim vtDiffFin As Vector3d = b3Tab.Max() - b3Raw.Max()
+                     vtMove = vtDiffFin - vtDiffIni
+                  Else
+                     Dim vtDiffIni As Vector3d = b3Tab.Max() - b3OrigRaw.Max()
+                     Dim vtDiffFin As Vector3d = b3Raw.Min() - b3Tab.Min()
+                     vtMove = -(vtDiffFin - vtDiffIni)
+                  End If
+                  vtMove.z = 0
+                  MoveAllRawParts(vtMove)
+                  ' Ripristino i limiti della tavola in tutte le fasi
+                  For nI As Integer = 1 To EgtGetPhaseCount()
+                     EgtSetCurrPhase(nI)
+                     EgtSetTableAreaOffset(0, 0, 0, 0)
+                  Next
+                  EgtSetCurrPhase(1)
+                  HideAllMachinings()
+               End If
+
+               ' visualizzazione
+               EgtZoom(ZM.ALL)
+               ' Elimino il datacontext della finsetra per la selezione della tavola
+               ChgTbVM = Nothing
+               Exit While
+            End If
          End If
          nId = EgtGetNextObjInSelWin()
       End While

OptionPanel/OptionPanelV.xaml

@@ -14,24 +14,26 @@
                 Padding="0,0,0,0"
                 Margin="5,0.5,5,0"
                 Style="{StaticResource TabControlOptinPanel}">
-         <TabItem ToolTip="{Binding RawPartTabMsg}" IsEnabled="{Binding RawTabIsEnabled}"    
+         <TabItem IsEnabled="{Binding RawTabIsEnabled}"    
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/icone-tagli-5.png" Stretch="UniformToFill"/>
+                  <Image Source="/Resources/NewIcons/icone-tagli-5.png" 
+                         Stretch="UniformToFill"
+                         ToolTip="{Binding RawPartTabMsg}"/>
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
                <OmagOFFICE:RawPartTabV DataContext="{StaticResource RawPartTabVM}"/>
             </TabItem.Content>
          </TabItem>
-         <TabItem ToolTip="{Binding NestingTabMsg}" IsEnabled="{Binding NestTabIsEnabled}"
+         <TabItem  IsEnabled="{Binding NestTabIsEnabled}"
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/Nest.png" Stretch="Uniform" />
+                        <Image ToolTip="{Binding NestingTabMsg}" Source="/Resources/NewIcons/Nest.png" Stretch="Uniform" />
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
@@ -43,24 +45,24 @@
                 </Style>
             </TabItem.Style>-->
          </TabItem>
-         <TabItem ToolTip="{Binding MachiningTabMsg}" IsEnabled="{Binding MachTabIsEnabled}"
+         <TabItem  IsEnabled="{Binding MachTabIsEnabled}"
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/Split.png" Stretch="Uniform" />
+                        <Image ToolTip="{Binding MachiningTabMsg}" Source="/Resources/NewIcons/Split.png" Stretch="Uniform" />
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
                <OmagOFFICE:MachiningTabV DataContext="{StaticResource MachiningTabVM}"/>
             </TabItem.Content>
          </TabItem>
-         <TabItem ToolTip="{Binding SimulTabMsg}" IsEnabled="{Binding SimulTabIsEnabled}"
+         <TabItem  IsEnabled="{Binding SimulTabIsEnabled}"
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/Simula.png" Stretch="Uniform" />
+                        <Image ToolTip="{Binding SimulTabMsg}" Source="/Resources/NewIcons/Simula.png" Stretch="Uniform" />
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
@@ -68,6 +70,7 @@
             </TabItem.Content>
          </TabItem>
       </TabControl>
+       <!--Se click + Key Shift sopra Label apertura dellì file Log-->
       <Label Grid.Row="1"
              Background="Transparent" 
              MouseLeftButtonDown="Label_MouseLeftButtonDown"/>

OptionPanel/OptionPanelV.xaml.vb

@@ -28,6 +28,7 @@ Public Class OptionPanelV
    End Sub
 
    Private Sub Label_MouseLeftButtonDown(sender As Object, e As MouseButtonEventArgs)
+      If Not (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then Return
       Dim sTmpDir As String = String.Empty
       If Not EgtInterface.EgtGetTempDir(sTmpDir) Then Return
       ' Genero file CNC (lancio anche se errore in precedenza)

OptionPanel/RawPartTab/OmagPhotoV.xaml

@@ -10,12 +10,10 @@
         d:DesignHeight="300" d:DesignWidth="300"
         Title="OmagPHOTO"
         ResizeMode="NoResize" ShowInTaskbar="False">
-    <EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>
-    <!--<DockPanel>
-        <Grid>
-            <ContentControl Content="{Binding OmagPhotoContent}"/>
-           
-        </Grid>
-    </DockPanel>-->
+    <DockPanel>
+      
+        <!--Progetto corrente-->
+        <EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>
 
+    </DockPanel>
 </EgtWPFLib5:EgtCustomWindow>

OptionPanel/RawPartTab/OmagPhotoV.xaml.vb

@@ -2,13 +2,11 @@
 
    'Private m_OmagPhotoVM As OmagPhotoVM
 
-   'Sub New(Owner As Window, OmagPhotoVM As OmagPhotoVM)
+   'Public Sub New(Owner As Window)
    '   MyBase.New(Owner)
-   '   ' This call is required by the designer.
+   '   'This call Is required by the designer.
    '   InitializeComponent()
-   '   Me.DataContext = OmagPhotoVM
-   '   ' Assegno al riferimento locale al VM il VM preso dal DataContext
-   '   m_OmagPhotoVM = OmagPhotoVM
+
    'End Sub
 
 End Class

OptionPanel/RawPartTab/RawPartTabV.xaml

@@ -25,14 +25,16 @@
                     <Image Source="/Resources/RawPartTab/SlabId.png" Stretch="Uniform"/>
                 </Button>
                 <Button Style="{StaticResource OptionPanelRaw_Button}"
-                    Grid.Column="2" Grid.Row="0"
+                    Grid.Column="2" Grid.Row="0"                       
                     Command="{Binding PhotoCommand}"
+                    ToolTip="{Binding PhotoToolTip }"
                     Margin="0,0,0,0" >
                     <Image Source="/Resources/RawPartTab/Photo.png" Stretch="Uniform"/>
                 </Button>
                 <ToggleButton Style="{StaticResource OptionPanelRaw_ToggleButton}"
                     Grid.Column="4" Grid.Row="0"
                     IsChecked="{Binding PhotoWithMouse}"
+                    ToolTip="{Binding MovePhotoToolTip }"          
                     Margin="0,0,0,0" >
                     <Image Source="/Resources/RawPartTab/MovePhoto.png" Stretch="Uniform" Width="40"/>
                 </ToggleButton>

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -43,7 +43,7 @@ Public Class RawPartTabVM
    Private m_nTempLay As Integer = GDB_ID.NULL
 
    ' Layer per crocette dei punti REG
-   Private m_nRegGroupId As Integer = GDB_ID.NULL
+   Friend m_nRegGroupId As Integer = GDB_ID.NULL
    ' Numero di spot inseriti nel grezzo corrente
    Private m_nCountSpot As Integer = 0
    ' Gruppo Spot attualmente selezionato
@@ -1025,7 +1025,7 @@ Public Class RawPartTabVM
 
    Public ReadOnly Property ModMsg As String
       Get
-         Return "Modifica"
+         Return EgtMsg(91668)
       End Get
    End Property
 
@@ -1055,7 +1055,7 @@ Public Class RawPartTabVM
 
    Public ReadOnly Property PointsRegMsg As String
       Get
-         Return "Registration"
+         Return EgtMsg(91669)
       End Get
    End Property
 
@@ -1069,6 +1069,12 @@ Public Class RawPartTabVM
       End Get
    End Property
 
+   Public ReadOnly Property MovePhotoToolTip As String
+      Get
+         Return EgtMsg(MSG_RAWPARTTAB + 3)
+      End Get
+   End Property
+
 #End Region    ' ToolTip
 
    ' Definizione comandi
@@ -1085,9 +1091,12 @@ Public Class RawPartTabVM
       ' Creo riferimento a questa classe in OmagOFFICEMap
       OmagOFFICEMap.SetRefRawPartTabVM(Me)
       If OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB Then
-         'Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow(), New OmagPhotoVM)
+         ' Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow())
          Me.OmagPhoto = New OmagPhotoV
-         If Not PhotoMap.ContinueApplication Then End
+         If Not PhotoMap.ContinueApplication Then
+            EgtOutLog("Key protection denied to acces to DB photo, set configuration to image directory")
+            End
+         End If
       End If
       ' Aggiungo voci alla lista di tipi di definizione grezzo
       m_TypeList.Add(EgtMsg(MSG_RAWPARTPAGEUC + 1))
@@ -1969,10 +1978,14 @@ Public Class RawPartTabVM
       Return True
    End Function
 
-   Private Sub MoveAllSpotRegistration(vtMove As Vector3d)
-      Dim nId As Integer = EgtGetFirstInGroup(m_nRegGroupId)
+   Friend Sub MoveAllSpotRegistration(vtMove As Vector3d, Optional bOnlyOfficeSpot As Boolean = True)
+      Dim nId As Integer = EgtGetFirstInGroup(OmagOFFICEMap.refRawPartTabVM.m_nRegGroupId)
       While nId <> GDB_ID.NULL
-         EgtMove(nId, vtMove)
+         Dim sName As String = String.Empty
+         EgtGetName(nId, sName)
+         If Not sName.Contains("CUT") Or Not bOnlyOfficeSpot Then
+            EgtMove(nId, vtMove)
+         End If
          nId = EgtGetNext(nId)
       End While
       EgtDraw()
@@ -2249,6 +2262,13 @@ Public Class RawPartTabVM
          PhotoMap.refSearchPanelVM.InitSearchPanel()
          ' inizializzo la ricerca a tutti le lastre di tipo "AVAILABLE" (=1)
          PhotoMap.refSearchPanelVM.State = 1
+
+         ' Resetto la data corrente per la prima ricerca 
+         PhotoMap.refSearchPanelVM.StartAddedDate = Nothing
+         PhotoMap.refSearchPanelVM.NotifyPropertyChanged("StartAddedDate")
+         PhotoMap.refSearchPanelVM.EndAddedDate = Nothing
+         PhotoMap.refSearchPanelVM.NotifyPropertyChanged("EndAddedDate")
+
          PhotoMap.refSearchPanelVM.Search()
          ' inserisco in elenco solo i materiali della macchina corrente
          AddHandler PhotoMap.refOptionPanelVM.SlabIsSelectedOFFICE, AddressOf OmagOFFICEMap.refRawPartTabVM.ClosePhotoWnd
@@ -2258,10 +2278,9 @@ Public Class RawPartTabVM
          m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
          m_RefreshTimer.Start()
 
-         ' apro la finestra per accedere al DB delle lastre
+         ' apro la finestra per accedere al DB delle lastre (Devo crea una nuova istanza perchè la chiusura elimina la stessa)
          Me.OmagPhoto = New OmagPhotoV
-         OmagPhoto.ShowDialog()
-
+         Me.OmagPhoto.ShowDialog()
          m_RefreshTimer.Stop()
 
          EgtSetCurrentContext(EgtPHOTOLib.MainData.PreviousContext)
@@ -2299,6 +2318,17 @@ Public Class RawPartTabVM
          ' aggiungo la nuova lastra
          OmagOFFICEMap.refMachGroupPanelVM.SlabNameListCurr.Add(sSlabNameDB)
          EgtPHOTOLib.PhotoMap.refOptionPanelVM.SetAssignedSlab(sSlabNameDB)
+
+         ' Provo ad assegnare il nome della macchinata
+         Dim sName As String = LocalSlab.Id
+         EgtGetMachGroupNewName(sName)
+         If sName <> LocalSlab.Id Then
+            EgtOutLog("Nome lastra (Id lastra) già presente nell'elenco delle macchinate correnti!")
+         Else
+            OmagOFFICEMap.refMachGroupPanelVM.SelectedMachGroup.SetName(LocalSlab.Id)
+            EgtChangeMachGroupName(EgtGetCurrMachGroup, LocalSlab.Id)
+         End If
+
       Else
          ' Apro dialogo per scelta immagine
          Dim PhotoDlg As New Microsoft.Win32.OpenFileDialog()

OptionPanel/SimulTab/SimulTabV.xaml

@@ -10,7 +10,7 @@
                  Style="{StaticResource Simul_Button_Img}">
             <Image Source="/Resources/SimulTab/ToolMode.png" Stretch="Uniform"/>
          </Button>
-         <Button Command="{Binding Simul_Button_Img}"
+            <Button Command="{Binding HeadModeCommand}"
                  Style="{StaticResource Simul_Button_Img}">
             <Image Source="/Resources/SimulTab/HeadMode.png" Stretch="Uniform"/>
          </Button>

OptionPanel/SimulTab/SimulTabVM.vb

@@ -17,7 +17,13 @@ Public Class SimulTabVM
 
    Public ReadOnly Property MachViewMsg As String
       Get
-         Return "Vista macchina"
+         Return EgtMsg(91667)
+      End Get
+   End Property
+
+   Public ReadOnly Property EstimationMsg As String
+      Get
+         Return EgtMsg(91668)
       End Get
    End Property
 

Project/ProjectV.xaml

@@ -11,14 +11,40 @@
     </DockPanel>
 
     <DockPanel x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">
+        <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">-->
+        <!--<DockPanel>
+            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}" DockPanel.Dock="Left"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}" />
+            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}" />
+            <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}" DockPanel.Dock="Right"/>
+            <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}" DockPanel.Dock="Right"/>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}" DockPanel.Dock="Right"/>
+        </DockPanel>-->
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="19.75*"/>
+                <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="3*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="0.25*"/>
+            </Grid.ColumnDefinitions>
+            <OmagOFFICE:MachinePanelV Grid.Column="0" DataContext="{StaticResource MachinePanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV Grid.Column="1" DataContext="{StaticResource VeinMatchPanelVM}"/>
+            <OmagOFFICE:PrintPanelV Grid.Column="2" DataContext="{StaticResource PrintPanelVM}"/>
+            <OmagOFFICE:ShowPanelV Grid.Column="5" DataContext="{StaticResource ShowPanelVM}"/>
+            <OmagOFFICE:ViewPanelV Grid.Column="4" DataContext="{StaticResource ViewPanelVM}"/>
+            <OmagOFFICE:InstrumentPanelV  Grid.Column="6" DataContext="{StaticResource InstrumentPanelVM}"/>
+        </Grid>
+        <!--<OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
+        <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
             <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
             <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
-            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
-            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
-            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
-            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
-        </StackPanel>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>-->
+        <!--</StackPanel>-->
     </DockPanel>
 
     <DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
@@ -36,5 +62,5 @@
     </DockPanel>
 
     <OmagOFFICE:SceneHostV />
-   
+
 </DockPanel>

SideEntityControl/SideEntityControlVM.vb

@@ -7,6 +7,8 @@ Public Class SideEntityControlVM
 
    Private Const INFO_ALZFRONT As String = "AF"
 
+   Private ColorText As New Color3d(0, 0, 0)
+
    Public Enum ModeOpt As Integer
       SIDEANGLE = 0   ' inclina lato
       DRIP = 1        ' incidi da sotto
@@ -68,7 +70,7 @@ Public Class SideEntityControlVM
             sMsg = EgtMsg(91653)
          ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
             ' Alz
-            sMsg = "Alz."
+            sMsg = EgtMsg(91674)
          End If
          Return sMsg
       End Get
@@ -85,7 +87,7 @@ Public Class SideEntityControlVM
             sMsg = EgtMsg(91654)
          ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
             ' Front
-            sMsg = "Front."
+            sMsg = EgtMsg(91675)
          End If
          Return sMsg
       End Get
@@ -543,7 +545,7 @@ Public Class SideEntityControlVM
       NotifyPropertyChanged("SideEntityList")
       m_SideAngleCheck = If(GetMainPrivateProfileInt(S_COMPO, K_SIDEMODE, 0) = 0, True, False)
       SideAngleEntity.dMaxSideAng = GetMainPrivateProfileDouble(S_SIDES, K_MAXSIDEANGLE, SideAngleEntity.STD_MAXSIDEANG)
-
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, ColorText)
       '------------------ DEFINIZIONE LISTA LATI
       ' creo la lista dei parametri 
       If CallingWindow = CallingWindowOpt.COMPO Then
@@ -615,7 +617,7 @@ Public Class SideEntityControlVM
       ElseIf m_Mode = ModeOpt.FILOTOP Then
          Parameter1Msg = EgtMsg(MSG_IMPORTPAGEUC + 10)      ' Offset
          Parameter2Msg = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Depth
-         Parameter5Msg = "Round Off"
+         Parameter5Msg = EgtMsg(91676)                      ' Round Off
          m_dOffsetFiloTop = GetMainPrivateProfileDouble(S_SIDES, K_FILOTOPOFFSET, 5)
          m_dDepthFiloTop = GetMainPrivateProfileDouble(S_SIDES, K_FILOTOPDEPTH, 5)
          m_bCornerRadius = GetMainPrivateProfileInt(S_SIDES, K_FILOTOPROUNDOFF, 0) <> 0
@@ -644,9 +646,9 @@ Public Class SideEntityControlVM
 
       ElseIf m_Mode = ModeOpt.ALZANDFRONT Then
          ' definisco i nomi dei campi
-         Parameter1Msg = "Spessore"
-         Parameter2Msg = "Altezza"
-         Parameter3Msg = "Delta Ang."
+         Parameter1Msg = EgtMsg(91677)    ' Spessore
+         Parameter2Msg = EgtMsg(91678)    ' Altezza
+         Parameter3Msg = EgtMsg(91679)    ' Delta Ang.
          ' carico i valori letti da file ini
          m_HeightA = GetMainPrivateProfileDouble("Alz&Front", "A_Height", 0)
          m_HeightF = GetMainPrivateProfileDouble("Alz&Front", "F_Height", 0)
@@ -704,7 +706,7 @@ Public Class SideEntityControlVM
       Else
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       ' Se modalità angoli di inclinazione...
@@ -773,7 +775,7 @@ Public Class SideEntityControlVM
       If TextLayer = GDB_ID.NULL Then
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       Dim PrevLine As Integer = EgtGetLastInGroup(LoopId)
@@ -1515,20 +1517,22 @@ Public Class SideEntityControlVM
    End Sub
 
    Shared Sub WriteSideAngleForNest(nCtx As Integer)
+      Dim LocalColor As New Color3d(0, 0, 0)
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, LocalColor)
       ' Imposto contesto corrente
       EgtSetCurrentContext(nCtx)
       Dim PartId As Integer = EgtGetFirstPart()
       While PartId <> GDB_ID.NULL
          ' Se richiesti lati paralleli con misura sul top come in TRF, verifico e aggiusto
-         If GetMainPrivateProfileInt( S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
-            AdjustAsTrfParSides( PartId)
-         End If 
+         If GetMainPrivateProfileInt(S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
+            AdjustAsTrfParSides(PartId)
+         End If
          ' Elimino eventuale precedente layer per testi
          EgtErase(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
          ' Creo layer per testi nesting
          Dim TextLayId As Integer = EgtCreateGroup(PartId)
          EgtSetName(TextLayId, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayId, New Color3d(0, 0, 128))
+         EgtSetColor(TextLayId, LocalColor)
          ' Opero su geometria esterna pezzo
          WriteSideAngleOnLoop(EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP), TextLayId)
          ' Ciclo su geometria interna pezzo
@@ -1840,7 +1844,7 @@ Public Class SideEntityControlVM
       Dim sMsg As String = String.Empty
       ' eseguo la funzione per il disegno della componente (CMP_Draw)
       If Not EgtLuaExecLine("CMP_Draw" & "(true)") Then
-         sMsg = "Error in component execution"
+         sMsg = EgtMsg(91680)      ' Error in component execution
          'm_bDrawOk = False
       Else
          EgtLuaGetGlobStringVar("CMP" & ".MSG", sMsg)

TopCommandBar/TopCommandBarVM.vb

@@ -74,12 +74,12 @@ Public Class TopCommandBarVM
    End Property
    Public ReadOnly Property ExportToolTip As String
       Get
-         Return EgtMsg( 91505)               'Esporta in macchina
+         Return EgtMsg(91505)               'Esporta in macchina
       End Get
    End Property
    Public ReadOnly Property DxfOutToolTip As String
       Get
-         Return EgtMsg( 91506)               'Esporta DXF
+         Return EgtMsg(91506)               'Esporta DXF
       End Get
    End Property
    Public ReadOnly Property OptionsToolTip As String
@@ -226,6 +226,18 @@ Public Class TopCommandBarVM
    ''' Execute the SaveAs.  This method is invoked by the SaveAsCommand.
    ''' </summary>
    Public Sub SaveAs(ByVal param As Object)
+      'Dim SaveFileDialog As New System.Windows.Forms.SaveFileDialog()
+      'SaveFileDialog.Filter = "(*.nge) |*.nge"
+      'SaveFileDialog.FilterIndex = 2
+      '' avvio la ricerca nell'ultimo direttorio aperto
+      'Dim sFilePath As String = String.Empty
+      'EgtGetCurrFilePath(sFilePath)
+      'SaveFileDialog.InitialDirectory = Path.GetExtension(sFilePath)
+      'SaveFileDialog.FileName = Path.GetFileName(sFilePath)
+      '' apro la finestra di dialogo
+      'Dim bChangeProject As Boolean = True
+      'If SaveFileDialog.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
+      'Dim sNewFilePath As String = SaveFileDialog.FileName
       ' non posso avere la stessa lastra in due progetti -> gestita da DataBase
       OmagOFFICEMap.refSceneHostVM.SaveAsProject()
    End Sub
@@ -238,12 +250,12 @@ Public Class TopCommandBarVM
    ''' Returns a command that do Export.
    ''' </summary>
    Public ReadOnly Property ExportCommand As ICommand
-         Get
-            If m_cmdExport Is Nothing Then
-               m_cmdExport = New Command(AddressOf Export)
-            End If
-            Return m_cmdExport
-         End Get
+      Get
+         If m_cmdExport Is Nothing Then
+            m_cmdExport = New Command(AddressOf Export)
+         End If
+         Return m_cmdExport
+      End Get
    End Property
 
    ''' <summary>
@@ -436,4 +448,42 @@ Public Class TopCommandBarVM
 
 #End Region    ' Commands
 
+   Public Shared Sub SetInfoProj(Optional sFilePath As String = "")
+      EgtOutLog(" *** SAVE PROJECT ***")
+      ' Recupero l'ID della macchinata corrente
+      Dim CurrGrpId As Integer = EgtGetCurrMachGroup()
+      ' Path completa del progetto corrente
+      If String.IsNullOrEmpty(sFilePath) Then EgtGetCurrFilePath(sFilePath)
+      Dim nPartInRawsProj As Integer = 0
+      Dim nGrpId = EgtGetFirstMachGroup()
+      While nGrpId <> GDB_ID.NULL
+         ' Imposto la macchinata corrente
+         EgtSetCurrMachGroup(nGrpId)
+         ' recupero il primo grezzo della macchinata corrente
+         Dim nRawId As Integer = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            nPartInRawsProj += EgtGetPartInRawPartCount(nRawId)
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+         nGrpId = EgtGetNextMachGroup(nGrpId)
+      End While
+      nGrpId = EgtGetFirstMachGroup()
+      While nGrpId <> GDB_ID.NULL
+         ' percorso progetto
+         EgtSetInfo(nGrpId, "ProjPath", sFilePath)
+         ' Anno/Mese/Giorno/Ora/min di salvataggio
+         EgtSetInfo(nGrpId, "Released", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"))
+         ' numero di pezzi presenti nel progetto
+         EgtSetInfo(nGrpId, "NbrProjParts", nPartInRawsProj.ToString)
+         nGrpId = EgtGetNextMachGroup(nGrpId)
+      End While
+      EgtOutLog("     ProjPath:" & sFilePath)
+      EgtOutLog("     Released:" & DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"))
+      EgtOutLog("     NbrProjParts:" & nPartInRawsProj.ToString)
+      ' Reimposto la macchina corrente
+      EgtSetCurrMachGroup(CurrGrpId)
+      ' Nascondo tutte le lavorazioni
+      CamAuto.HideAllMachinings()
+   End Sub
+
 End Class

Utility/OmagOFFICEDictionary.xaml

@@ -68,7 +68,7 @@
 
     <!--Colore del contorno quando il Mouse è sopra la TextBox-->
     <LinearGradientBrush x:Key="BrushBorderIsMouseOverTText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
-        <GradientStop Color="#484D55" Offset="0.05"/>
+      <GradientStop Color="#1C1D22" Offset="0.05"/>
         <GradientStop Color="#1C1D22" Offset="0.07"/>
     </LinearGradientBrush>
 
@@ -595,6 +595,12 @@
         <Setter Property="Height" Value="40"/>
     </Style>
 
+    <Style x:Key="ChangeTable_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="50"/>
+        <Setter Property="Width" Value="50"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
     <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Padding" Value="5"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -844,16 +850,16 @@
 
     <!-- CsvTreeViewItem DA CAMBIARE!! -->
 
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Stroke" Color="#FF262626"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Stroke" Color="#FF1BBBFA"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Fill" Color="Transparent"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="#FF262626"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF595959"/>
-    <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
-    <Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Stroke" Color="#FF1BBBFA"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Fill" Color="Transparent"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Stroke" Color="#FF262626"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="#FF262626"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF595959"/>
+   <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
+   <!--<Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="16"/>
         <Setter Property="Height" Value="16"/>
@@ -895,64 +901,167 @@
         </Setter>
     </Style>
 
-    <Style x:Key="CsvPartItemStyle" TargetType="{x:Type TreeViewItem}">
-        <Setter Property="IsSelected" Value="{Binding IsSelected}" />
-        <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TreeViewItem}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition MinWidth="19" Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Border x:Name="ExpanderBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
-                        </Border>
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                        <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="false">
-                            <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
-                        </Trigger>
-                        <Trigger Property="HasItems" Value="false">
-                            <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                            <Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
-                            <Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
-                            <Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                            <Setter Property="BorderThickness" TargetName="ExpanderBorder" Value="1,1,0,1"/>
-                            <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
-                        </Trigger>
-                        <!--<MultiTrigger>
+   <Style x:Key="CsvPartItemStyle" TargetType="{x:Type TreeViewItem}">
+      <Setter Property="IsSelected" Value="{Binding IsSelected}" />
+      <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition MinWidth="19" Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition/>
+                  </Grid.RowDefinitions>
+                  <Border x:Name="ExpanderBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                     <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
+                  </Border>
+                  <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="false">
+                     <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                  </Trigger>
+                  <Trigger Property="HasItems" Value="false">
+                     <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
+                     <Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
+                     <Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="BorderThickness" TargetName="ExpanderBorder" Value="1,1,0,1"/>
+                     --><!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>--><!--
+                  </Trigger>
+                  --><!--<MultiTrigger>
                                  <MultiTrigger.Conditions>
                                     <Condition Property="IsSelected" Value="true"/>
                                     <Condition Property="IsSelectionActive" Value="false"/>
                                  </MultiTrigger.Conditions>
                                  <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
                                  <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                              </MultiTrigger>-->
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                              </MultiTrigger>--><!--
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>-->
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <Style x:Key="Db_ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Focusable" Value="False"/>
+      <Setter Property="Width" Value="16"/>
+      <Setter Property="Height" Value="16"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Background="Transparent" Height="16" Padding="5,5,5,5" Width="16">
+                  <Path x:Name="ExpandPath" Data="{StaticResource TreeArrow}" Fill="{StaticResource TreeViewItem.TreeArrow.Static.Fill}" Stroke="White">
+                     <Path.RenderTransform>
+                        <RotateTransform Angle="135" CenterY="3" CenterX="3"/>
+                     </Path.RenderTransform>
+                  </Path>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter Property="RenderTransform" TargetName="ExpandPath">
+                        <Setter.Value>
+                           <RotateTransform Angle="180" CenterY="3" CenterX="3"/>
+                        </Setter.Value>
+                     </Setter>
+                     <Setter Property="Fill" TargetName="ExpandPath" Value="white"/>
+                     <Setter Property="Stroke" TargetName="ExpandPath" Value="white"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Stroke}"/>
+                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Fill}"/>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsMouseOver" Value="True"/>
+                        <Condition Property="IsChecked" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Stroke}"/>
+                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Fill}"/>
+                  </MultiTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="TreeViewItemFocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Rectangle/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="Db_TreeViewItem" TargetType="{x:Type TreeViewItem}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="Padding" Value="1,0,0,0"/>
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition MinWidth="19" Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition/>
+                  </Grid.RowDefinitions>
+                  <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource Mode=TemplatedParent}}" Style="{StaticResource Db_ExpandCollapseToggleStyle}"/>
+                  <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <ItemsPresenter x:Name="ItemsHost" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="false">
+                     <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                  </Trigger>
+                  <Trigger Property="HasItems" Value="false">
+                     <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="true"/>
+                        <Condition Property="IsSelectionActive" Value="false"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
     <!-- ComboBox -->
 
@@ -1024,11 +1133,13 @@
     </Style>
 
     <Style TargetType="{x:Type ComboBox}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="Background" Value="{StaticResource ButtonNormalBackground}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
-        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Height" Value="25" />
+        <Setter Property="Width" Value="Auto" />
+
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="Padding" Value="4,3"/>
@@ -1177,7 +1288,7 @@
     <Style x:Key="ImgButton" TargetType="{x:Type Image}" >
         <Setter Property="Height" Value="35"/>
         <Setter Property="Width" Value="35"/>
-        <Setter Property="Margin" Value="0,2,0,0"/>
+        <Setter Property="Margin" Value="0,0,0,0"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
@@ -1215,4 +1326,296 @@
         <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
     </Style>
 
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- Expander -->
+    <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="DarkGray"/>
+    <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="Transparent"/>
+    <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="#666"/>
+    <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="#FF3C7FB1"/>
+    <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="Transparent"/>
+    <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="#222"/>
+    <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="#FF526C7B"/>
+    <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="Transparent"/>
+    <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="#FF003366"/>
+    <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="DarkGray"/>
+    <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="Transparent"/>
+    <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#666"/>
+    <Style x:Key="ExpanderHeaderFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border>
+                        <Rectangle Margin="0" StrokeDashArray="1 2" Stroke="black" SnapsToDevicePixels="true" StrokeThickness="1"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--ExpanderDirection: Down (in uso nella pagin Split)-->
+    <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="15"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Rectangle x:Name="circle" Fill="Transparent" HorizontalAlignment="Center" Height="15" 
+                                     Stroke="Transparent" VerticalAlignment="Center" Width="15"/>
+                            <Path x:Name="arrow" Data="M 1,4.5  L 4.5,1  L 8,4.5" HorizontalAlignment="Center" Stroke="White" 
+                                  SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                            <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <!--<Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>-->
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Fill" TargetName="circle" Value="#008BFF"/>
+                            <Setter Property="Stroke" TargetName="circle" Value="#008BFF"/>
+                        </Trigger>
+
+                        <!--<Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>-->
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Fill" TargetName="circle" Value="#E1B957"/>
+                            <Setter Property="Stroke" TargetName="circle" Value="#E1B957"/>
+                        </Trigger>
+                        
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="ToggleButton.Background" Value="{StaticResource Omag_Blue}" />
+                            <Setter Property="ToggleButton.BorderBrush" Value="{StaticResource Omag_Blue}" />
+                            <Setter Property="ToggleButton.Foreground" Value="{StaticResource Omag_Yellow}"/>
+                        </Trigger>
+
+                        <!--<Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>-->
+                        <Trigger Property="IsEnabled" Value="false">
+                            <!--<Setter Property="ToggleButton.Background" Value="#FFF4F4F4"/>
+                            <Setter Property="ToggleButton.BorderBrush" Value="#FFADB2B5"/>
+                            <Setter Property="ToggleButton.Foreground" Value="#FF838383"/>-->
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+
+                        
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="19"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid>
+                                <Grid.LayoutTransform>
+                                    <TransformGroup>
+                                        <TransformGroup.Children>
+                                            <TransformCollection>
+                                                <RotateTransform Angle="180"/>
+                                            </TransformCollection>
+                                        </TransformGroup.Children>
+                                    </TransformGroup>
+                                </Grid.LayoutTransform>
+                                <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" 
+                                         Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                                <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                            </Grid>
+                            <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="19"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Grid>
+                                <Grid.LayoutTransform>
+                                    <TransformGroup>
+                                        <TransformGroup.Children>
+                                            <TransformCollection>
+                                                <RotateTransform Angle="90"/>
+                                            </TransformCollection>
+                                        </TransformGroup.Children>
+                                    </TransformGroup>
+                                </Grid.LayoutTransform>
+                                <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                                <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                            </Grid>
+                            <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="19"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Grid>
+                                <Grid.LayoutTransform>
+                                    <TransformGroup>
+                                        <TransformGroup.Children>
+                                            <TransformCollection>
+                                                <RotateTransform Angle="-90"/>
+                                            </TransformCollection>
+                                        </TransformGroup.Children>
+                                    </TransformGroup>
+                                </Grid.LayoutTransform>
+                                <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                                <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                            </Grid>
+                            <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                            <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                            <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                            <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <Style TargetType="{x:Type Expander}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Expander}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true">
+                        <DockPanel>
+                            <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" DockPanel.Dock="Top" FontStretch="{TemplateBinding FontStretch}" Foreground="{TemplateBinding Foreground}" FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}" FontStyle="{TemplateBinding FontStyle}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ExpanderDownHeaderStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="Collapsed"/>
+                        </DockPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="true">
+                            <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Right">
+                            <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right"/>
+                            <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
+                            <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}"/>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Up">
+                            <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top"/>
+                            <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom"/>
+                            <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}"/>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Left">
+                            <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left"/>
+                            <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
+                            <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>

Utility/OmagOFFICEMap.vb

@@ -4,6 +4,23 @@ Imports EgtUILib
 
 Module OmagOFFICEMap
 
+   Friend StopWatch As Stopwatch
+
+   Friend Sub TimeSpanInit()
+      StopWatch = New Stopwatch
+      StopWatch.Start()
+   End Sub
+
+   Friend Function TimeSpanEnd() As String
+      Dim sTime As String = ""
+      If Not IsNothing(StopWatch) Then
+         StopWatch.Stop()
+         Dim ts As TimeSpan = StopWatch.Elapsed
+         sTime = String.Format("{0:00}:{1:00}:{2:00}.{3:000}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds)
+      End If
+      Return sTime
+   End Function
+
    Private m_refMainWindowVM As MainWindowVM
    Private m_refTopCommandBarVM As TopCommandBarVM
    Private m_refProjectVM As ProjectVM