Aggiunto comando "Muovi" per i tagli diretti

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
 

OmagOFFICE.vbproj

@@ -951,6 +951,15 @@
   <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>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -35,7 +35,7 @@
             </ListBox>
         </Border>
 
-        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,0,0,2.5">
 
             <Button Grid.Column="1"
                  IsEnabled="{Binding bEnabledCommandMove}"
@@ -54,200 +54,206 @@
 
         </StackPanel>
 
+        <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+            <Expander Name="myExpander4" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" Header="Attiva tagli"
+                  ExpandDirection="Down" IsExpanded="{Binding bOnOffCut_IsExpanded}">
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="2,2.5,2,0">
 
-
+                        <!--<Button Content="{Binding OnOffMsg}"
-        <GroupBox Header="Attiva tagli" Style="{StaticResource GroupBoxSplit}">
-
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="2,2.5,2,0">
-
-                <!--<Button Content="{Binding OnOffMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding OnOffCommand}"
                     Margin="0,0,2.5,0"/>-->
-                <StackPanel Margin="1,0,0,0">
+                        <StackPanel Margin="1,0,0,0">
-                    <Button ToolTip="{Binding OnOffMsg}"
+                            <Button ToolTip="{Binding OnOffMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OnOffCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                        <StackPanel>
+                                <StackPanel>
-                            <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
+                                    <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
                             Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
                         </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">
+                        <StackPanel Margin="1,0,0,0">
-                    <Button ToolTip="{Binding AllOnMsg}"
+                            <Button ToolTip="{Binding AllOnMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOnCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                        <StackPanel>
+                                <StackPanel>
-                            <Image Source="/Resources/NewIcons/Tutti-ON.png"
+                                    <Image Source="/Resources/NewIcons/Tutti-ON.png"
                             Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
                         </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">
+                        <StackPanel Margin="1,0,0,0">
-                    <Button ToolTip="{Binding AllOffMsg}"
+                            <Button ToolTip="{Binding AllOffMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOffCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                        <StackPanel>
+                                <StackPanel>
-                            <Image Source="/Resources/NewIcons/Tutti-OFF.png"
+                                    <Image Source="/Resources/NewIcons/Tutti-OFF.png"
                             Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
-                    </Button>
+
                 </StackPanel>
 
-            </StackPanel>
+            </Expander>
+        </Border>
 
-        </GroupBox>
+        <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+            <Expander Name="myExpander0" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" Header="Tagli di separazione"
+                  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>
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                                <!--<Button Content="{Binding CutMsg}"
-                    <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">
+                                <StackPanel Visibility="{Binding CutBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding CutMsg}"
+                                    <Button ToolTip="{Binding CutMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding CutCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
+                                        <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
+                                            <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
                             Height="40" Margin="0,2,0,0" 
                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </StackPanel>
+                                    </Button>
                                 </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">
+                                <StackPanel Visibility="{Binding BridgeBtnVisibility}" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="{Binding BridgeMsg}"
+                                    <ToggleButton ToolTip="{Binding BridgeMsg}"
                                     Style="{StaticResource Split_ToggleButton_Img}"
                                     IsChecked="{Binding BridgeBtn_IsChecked}"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"            
                                     Margin="0,0,0,0">
-                                <StackPanel>
+                                        <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Ponticelli.png"
+                                            <Image Source="/Resources/NewIcons/Ponticelli.png"
                                            Style="{StaticResource ImgButton}"/>
+                                        </StackPanel>
+                                    </ToggleButton>
                                 </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
 
-                    </Grid>
+                            </Grid>
 
-                    <Grid>
+                            <Grid>
-                        <!--<Button Content="{Binding CutStartMsg}"
+                                <!--<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">
+                                <StackPanel Visibility="{Binding CutStartBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding CutStartMsg}"
+                                    <Button ToolTip="{Binding CutStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding CutStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
+                                        <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
+                                            <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
                             Height="40" Margin="0,2,0,0" 
                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </StackPanel>
+                                    </Button>
                                 </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">
+                                <StackPanel Visibility="{Binding QualityBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding QualityMsg}"
+                                    <Button ToolTip="{Binding QualityMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding QualityCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
+                                        <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Quality.png"
+                                            <Image Source="/Resources/NewIcons/Quality.png"
                             Style="{StaticResource ImgButton}"/>
+                                        </StackPanel>
+                                    </Button>
                                 </StackPanel>
-                            </Button>
-                        </StackPanel>
 
-                    </Grid>
+                            </Grid>
 
-                    <Grid>
+                            <Grid>
-                        <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
+                                <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
-                            <Button ToolTip="{Binding CutEndMsg}"
+                                    <Button ToolTip="{Binding CutEndMsg}"
                                 Style="{StaticResource Split_Button_Img}"
                                 Command="{Binding CutEndCommand}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"            
                                 Margin="0,0,0,0">
-                                <StackPanel>
+                                        <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
+                                            <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
                                         Height="40" Margin="0,2,0,0" 
                                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </StackPanel>
+                                    </Button>
                                 </StackPanel>
-                            </Button>
-                        </StackPanel>
 
-                        <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
+                                <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
+                                    <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
                                 Style="{StaticResource Split_ToggleButton_Img}"
                                 IsChecked="{Binding BridgeDeleteBtn_IsChecked}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"            
                                 Margin="0,0,0,0">
-                                <StackPanel>
+                                        <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
+                                            <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
                                            Style="{StaticResource ImgButton}"/>
+                                        </StackPanel>
+                                    </ToggleButton>
                                 </StackPanel>
-                            </ToggleButton>
+
+                            </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 +262,45 @@
 
 
 
-                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllExtendMsg}" 
+                                <Button ToolTip="{Binding AllExtendMsg}" 
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllExtendCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Tutti-allunga.png"
+                                        <Image Source="/Resources/NewIcons/Tutti-allunga.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllReduceMsg}" 
+                                <Button ToolTip="{Binding AllReduceMsg}" 
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllReduceCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Tutti-accorcia.png"
+                                        <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">
+                       Width="40" Height="40"               
+                       Margin="1,0,0,0">
                             <StackPanel>
                                 <Image Source="/Resources/NewIcons/Crea-taglio.png"
                             Style="{StaticResource ImgButton}"/>
@@ -307,6 +314,7 @@
                        IsChecked="{Binding RemoveCut_IsChecked}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"       
+                       Width="40" Height="40"               
                        Margin="0,0,0,0">
                             <StackPanel>
                                 <Image Source="/Resources/NewIcons/Rimuovi-taglio.png"
@@ -321,183 +329,274 @@
                        IsChecked="{Binding CreateParallelCut_IsChecked}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"   
-                       Margin="0,0,0,0">
+                       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>
+                    <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>
 
-        </GroupBox>
+            </Expander>
+        </Border>
 
-        <GroupBox Header="Modifica attacchi tagli" Style="{StaticResource GroupBoxSplit}">
+        <Border Style="{StaticResource Border}" Margin="0,1,0,5">
-            <StackPanel Margin="0,0,0,-2.5">
+            <Expander Name="myExpander2" Background="Transparent"               
-                <UniformGrid Columns="4" Margin="0,2.5,0,1">
+                  Foreground="{DynamicResource Omag_White}"
-                    <StackPanel Visibility="{Binding OutCenStartBtnVisibility}" Margin="1,0,0,0">
+                  HorizontalAlignment="Stretch" Header="Tagli diretti di separazione"
-                        <Button ToolTip="{Binding OutCenStartMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bDirectSpLitCut_IsExpanded}">
+
+                    <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="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 Visibility="{Binding AllExtendBtnVisibility}" 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 Visibility="{Binding AllExtendBtnVisibility}" 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 Visibility="{Binding AllExtendBtnVisibility}" 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="myExpander1" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" Header="Modifica attacchi tagli" 
+                  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>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
+                                        <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllOutStartMsg}"
+                                <Button ToolTip="{Binding AllOutStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOutStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
+                                        <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllCenStartMsg}"
+                                <Button ToolTip="{Binding AllCenStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllCenStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
+                                        <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding OutCenEndMsg}"
+                                <Button ToolTip="{Binding OutCenEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OutCenEndCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
+                                        <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                </UniformGrid>
+                        </UniformGrid>
 
-                <UniformGrid Columns="4" Margin="0,0,0,1">
+                        <UniformGrid Columns="4" Margin="0,0,0,1">
 
-                    <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllOutEndMsg}"
+                                <Button ToolTip="{Binding AllOutEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOutEndCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
+                                        <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding AllCenEndMsg}"
+                                <Button ToolTip="{Binding AllCenEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllCenEndCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
+                                        <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Margin="1,0,0,0">
+                            <StackPanel Margin="1,0,0,0">
-                        <Button ToolTip="{Binding ModifStartMsg}"
+                                <Button ToolTip="{Binding ModifStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding ModifStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
+                                        <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Margin="1,0,0,0">
+                            <StackPanel Margin="1,0,0,0">
-                        <Button ToolTip="{Binding ModifEndMsg}"
+                                <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding ModifEndCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Modifica-Fine.png"
+                                        <Image Source="/Resources/NewIcons/Modifica-Fine.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </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-->
+                            <!--Bottone invisibile per permetter il corretto allineamento-->
-                    <Button Content="{Binding }" Grid.Column="0"
+                            <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">
+                            <StackPanel Margin="1,0,0,0">
-                        <Button ToolTip="{Binding PauseMsg}"
+                                <Button ToolTip="{Binding PauseMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding PauseCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
+                                        <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
                             Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
-                    </StackPanel>
 
-                    <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
+                            <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
-                        <Button ToolTip="{Binding InvertMsg}"
+                                <Button ToolTip="{Binding InvertMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding InvertCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                            <StackPanel>
+                                    <StackPanel>
-                                <Image Source="/Resources/NewIcons/Inverti.png"
+                                        <Image Source="/Resources/NewIcons/Inverti.png"
                                  Style="{StaticResource ImgButton}"/>
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Button>
+
+                        </UniformGrid>
+
                     </StackPanel>
 
-                </UniformGrid>
+            </Expander>
-
+        </Border>
-            </StackPanel>
-
-        </GroupBox>
-
     </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
@@ -316,8 +366,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 +384,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 +402,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"
@@ -525,6 +599,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 +691,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()
@@ -1330,6 +1414,17 @@ 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)
       If m_IdSplitGroup <> GDB_ID.NULL Then
@@ -1342,6 +1437,7 @@ Public Class SplitModeVM
       m_IdSplitGroup = GDB_ID.NULL
       m_IdSplitGroupLayer = GDB_ID.NULL
       m_IdCurrRawSolid = GDB_ID.NULL
+      m_IdSplitLineRemove = GDB_ID.NULL
    End Sub
 
    ' spegno il comando Split correntemente attivo
@@ -1350,9 +1446,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
@@ -2870,29 +2975,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 +2992,10 @@ Public Class SplitModeVM
       EgtAddPartToRawPart(nPartId, ptIns, m_IdCurrRawSolid)
       ' Inserisco la lavorazione
       bOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
-      ' Spengo la linea
+      '' Spengo la linea
-      If bOk Then
+      'If bOk Then
-         EgtSetStatus(m_IdSplitLine, GDB_ST.OFF)
+      '   EgtSetStatus(m_IdSplitLine, GDB_ST.OFF)
-      End If
+      'End If
       Return bOk
    End Function
 
@@ -2932,6 +3016,8 @@ Public Class SplitModeVM
    End Function
 
    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 +3083,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 +3137,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 +3200,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 +3219,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 +3344,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 +3407,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

OptionPanel/OptionPanelV.xaml

@@ -68,6 +68,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)

Utility/OmagOFFICEDictionary.xaml

@@ -1177,7 +1177,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 +1215,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>