Egalware/omagoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inizio preparazione interfaccia scura

Browse Source
This commit is contained in:
Nicola Pievani
2023-08-24 17:32:14 +02:00
parent e91b0e3087
commit 66685b7e4f
58 changed files with 1272 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CurrMachWindow/CurrMachWindowV.xaml
+13 -2
View File
@@ -6,19 +6,21 @@
IsResizable="False"
IsMinimizable="False"
IsClosable="False"
ShowInTaskbar="False"
ShowInTaskbar="False"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStartupLocation="CenterOwner"
WindowStartupLocation="CenterOwner"
Width="270" ResizeMode="NoResize" SizeToContent="Height">
<StackPanel Margin="5,5,5,0">
<!--TAGLIO-->
<TextBlock Text="{Binding CurrSawingMsg}"
Visibility="{Binding CurrSawing_Visibility}"
Style="{StaticResource RawTextBlock}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrSawingList}"
SelectedItem="{Binding SelCurrSawing}"
Visibility="{Binding CurrSawing_Visibility}"
Style="{DynamicResource Raw_ComboBox}"
Margin="0,0,0,5"/>
<!--<TextBlock Text="{Binding AuxMachTypeMsg}"
@@ -33,30 +35,37 @@
<!--FORATURA-->
<TextBlock Text="{Binding CurrDrillingMsg}"
Visibility="{Binding CurrDrilling_Visibility}"
Style="{StaticResource RawTextBlock}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrDrillingList}"
SelectedItem="{Binding SelCurrDrilling}"
Visibility="{Binding CurrDrilling_Visibility}"
Style="{DynamicResource Raw_ComboBox}"
Margin="0,0,0,5"/>
<!--FRESATURA-->
<TextBlock Text="{Binding CurrMillingMsg}"
Visibility="{Binding CurrMilling_Visibility}"
Style="{StaticResource RawTextBlock}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrMillingList}"
SelectedItem="{Binding SelCurrMilling}"
Visibility="{Binding CurrMilling_Visibility}"
Style="{DynamicResource Raw_ComboBox}"
Margin="0,0,0,5"/>
<!--SVUOTATURA-->
<TextBlock Text="{Binding CurrPocketingMsg}"
Visibility="{Binding CurrPocketing_Visibility}"
Style="{StaticResource RawTextBlock}"
Margin="0,0,0,5"/>
<ComboBox ItemsSource="{Binding CurrPocketingList}"
SelectedItem="{Binding SelCurrPocketing}"
Visibility="{Binding CurrPocketing_Visibility}"
Style="{DynamicResource Raw_ComboBox}"
Margin="0,0,0,5"/>
<!--WATERJET-->
<TextBlock Text="{Binding CurrWaterjettingMsg}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Style="{StaticResource RawTextBlock}"
Margin="0,0,0,5"/>
<Grid>
<Grid.ColumnDefinitions>
@@ -66,12 +75,14 @@
<ComboBox ItemsSource="{Binding CurrWaterjettingList}"
SelectedItem="{Binding SelCurrWaterjetting}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Style="{DynamicResource Raw_ComboBox}"
Margin="0,0,5,5"/>
<!--Quality-->
<ComboBox ItemsSource="{Binding CurrWaterjettingQualityList}"
SelectedItem="{Binding SelCurrWaterjettingQuality}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Style="{DynamicResource Raw_ComboBox}"
Margin="5,0,0,5"
Grid.Column="1">
</ComboBox>
CurrMachWindow/CurrMachWindowV.xaml.vb
+6
View File
@@ -9,6 +9,12 @@
Me.DataContext = CurrMachWindowVM
' Assegno al riferimento locale al VM il VM preso dal DataContext
m_CurrMachWindowVM = CurrMachWindowVM
End Sub
Private Sub Me_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
Me.Top = Owner.Top + Owner.Height / 2 - Me.ActualHeight / 2
Me.Left = Owner.Left + Owner.Width / 2 - Me.ActualWidth / 2
End Sub
Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
InstrumentPanel/InstrumentPanelV.xaml
+3 -5
View File
@@ -1,9 +1,7 @@
<EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
<DockPanel x:Class="InstrumentPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
<ToggleButton ToolTip="{Binding GetDistToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
@@ -11,4 +9,4 @@
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
</ToggleButton>
</EgtFloating:EgtFloatingPanel>
</DockPanel>
InstrumentPanel/PrintPanelV.xaml
+3 -5
View File
@@ -1,9 +1,7 @@
<EgtFloating:EgtFloatingPanel x:Class="PrintPanelV"
<DockPanel x:Class="PrintPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
<Button ToolTip="{Binding PrintToolTip}"
Style="{StaticResource ToolBar_Button}"
@@ -11,4 +9,4 @@
<Image Source="/Resources/InstrumentPanel/Print.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
</DockPanel>
MachinePanel/MachinePanelV.xaml
+8 -14
View File
@@ -1,10 +1,6 @@
<EgtFloating:EgtFloatingPanel x:Class="MachinePanelV"
<DockPanel x:Class="MachinePanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False"
Style="{StaticResource ToolBar_EgtFloatingPanel}"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
IsEnabled="{Binding MachPanel_IsEnabled}">
<!--Combobox per selezionare la macchina corrente--><!--
@@ -18,14 +14,12 @@
<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" />
</Button>
<Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding SetUpMsg}"
Background="{Binding SetUp_Background}"/>
<Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
Style="{StaticResource ToolBar_Button}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
<Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
<Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
</Button>
</EgtFloating:EgtFloatingPanel>
<Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
</DockPanel>
MachinePanel/MyMachinePanelVM.vb
+2 -2
View File
@@ -206,14 +206,14 @@ Public Class MyMachinePanelVM
If Not bOkSetUp Then
SetUp_Background = Brushes.Red
Else
SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
End If
If Not bOkMatThick Then
OmagOFFICEMap.refOptionPanelVM.RawPart_Background = Brushes.Red
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = Brushes.Red
Else
OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
End If
End Sub
MainWindow/MainWindowV.xaml
+9 -8
View File
@@ -4,11 +4,12 @@
xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
DataContext="{StaticResource MainWindowVM}"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Style="{DynamicResource MainWindowStyle}"
Title="{Binding Title}" Icon="/Resources/OmagOFFICE.ico"
MinHeight="600" MinWidth="800"
AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
Background="{StaticResource Omag_DarkGray}">
<EgtWPFLib5:EgtCustomWindow.TitlePanel>
<OmagOFFICE:TopCommandBarV DataContext="{StaticResource TopCommandBarVM}"/>
</EgtWPFLib5:EgtCustomWindow.TitlePanel>
@@ -16,12 +17,12 @@
<!--Pannello principale -->
<DockPanel>
<!--StatusBar -->
<OmagOFFICE:StatusBarV DataContext="{StaticResource StatusBarVM}"
<!--StatusBar -->
<OmagOFFICE:StatusBarV DataContext="{StaticResource StatusBarVM}"
DockPanel.Dock="Bottom"/>
<!--Progetto corrente -->
<OmagOFFICE:ProjectV DataContext="{StaticResource ProjectVM}"/>
<!--Progetto corrente -->
<OmagOFFICE:ProjectV DataContext="{StaticResource ProjectVM}"/>
</DockPanel>
</DockPanel>
</EgtWPFLib5:EgtCustomWindow>
MyMachGroupPanel/MyMachGroupPanelVM.vb
+3 -3
View File
@@ -237,7 +237,7 @@ Public Class MyMachGroupPanelVM
If Not bOkSetUp Then
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = Brushes.Red
Else
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
End If
' Imposto il colore di sfondo del pulsante SettingMachinig
If Not bOkMatThick Or Not bOkCurrSawing Then
@@ -246,11 +246,11 @@ Public Class MyMachGroupPanelVM
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = Brushes.Red
Else
OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
End If
Else
OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
End If
' Se non esiste il grezzo vado subito alla sua definizione
OmagOFFICE.vbproj
+4 -15
View File
@@ -123,6 +123,7 @@
<Reference Include="Ionic.Zip">
<HintPath>..\..\EgtProg\OmagOFFICE\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework.Aero" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -737,7 +738,6 @@
<Resource Include="Resources\NewIcons\DB-lavorazioni.png" />
<Resource Include="Resources\NewIcons\DB-utensili.png" />
<Resource Include="Resources\NewIcons\Deseleziona-tutto.png" />
<Resource Include="Resources\NewIcons\DownArrow.png" />
<Resource Include="Resources\NewIcons\Drag_Rettangle.png" />
<Resource Include="Resources\NewIcons\Elimina-pezzo.png" />
<Resource Include="Resources\NewIcons\Esegui.png" />
@@ -782,7 +782,6 @@
<Resource Include="Resources\NewIcons\ico-seleziona-tutto.png" />
<Resource Include="Resources\NewIcons\icone-tagli-1.png" />
<Resource Include="Resources\NewIcons\icone-tagli-2.png" />
<Resource Include="Resources\NewIcons\icone-tagli-3.png" />
<Resource Include="Resources\NewIcons\icone-tagli-4.png" />
<Resource Include="Resources\NewIcons\icone-tagli-5.png" />
<Resource Include="Resources\NewIcons\icone-tagli-6.png" />
@@ -793,13 +792,11 @@
<Resource Include="Resources\NewIcons\Inizio-tutti-fuori.png" />
<Resource Include="Resources\NewIcons\Inserisci-pezzo.png" />
<Resource Include="Resources\NewIcons\Inverti.png" />
<Resource Include="Resources\NewIcons\LeftArrow.png" />
<Resource Include="Resources\NewIcons\Linea.png" />
<Resource Include="Resources\NewIcons\logo-OmCut.png" />
<Resource Include="Resources\NewIcons\Lucidatura.png" />
<Resource Include="Resources\NewIcons\Macchina.png" />
<Resource Include="Resources\NewIcons\Manual.png" />
<Resource Include="Resources\NewIcons\MaxMove.png" />
<Resource Include="Resources\NewIcons\MHT.png" />
<Resource Include="Resources\NewIcons\Modifica-fine.png" />
<Resource Include="Resources\NewIcons\Modifica-inizio.png" />
@@ -811,22 +808,13 @@
<Resource Include="Resources\NewIcons\Options.png" />
<Resource Include="Resources\NewIcons\Parcheggia-pezzo.png" />
<Resource Include="Resources\NewIcons\Parking.png" />
<Resource Include="Resources\NewIcons\PartRotOff.png" />
<Resource Include="Resources\NewIcons\PartRotOn.png" />
<Resource Include="Resources\NewIcons\Pausa-ON_OFF.png" />
<Resource Include="Resources\NewIcons\Pause.png" />
<Resource Include="Resources\NewIcons\Play.png" />
<Resource Include="Resources\NewIcons\PlayStep.png" />
<Resource Include="Resources\NewIcons\Ponticelli.png" />
<Resource Include="Resources\NewIcons\Ponticelli_delete.png" />
<Resource Include="Resources\NewIcons\Quality.png" />
<Resource Include="Resources\NewIcons\RawProbe.png" />
<Resource Include="Resources\NewIcons\RightArrow.png" />
<Resource Include="Resources\NewIcons\Rimuovi-segmento.png" />
<Resource Include="Resources\NewIcons\Rimuovi_elimina.png" />
<Resource Include="Resources\NewIcons\ruota-oggetto-dx.png" />
<Resource Include="Resources\NewIcons\ruota-oggetto-inclinato.png" />
<Resource Include="Resources\NewIcons\ruota-oggetto-sx.png" />
<Resource Include="Resources\NewIcons\Salva-con-nome.png" />
<Resource Include="Resources\NewIcons\Salva-taglio.png" />
<Resource Include="Resources\NewIcons\Salva.png" />
@@ -841,7 +829,6 @@
<Resource Include="Resources\NewIcons\SPLIT-WJ.png" />
<Resource Include="Resources\NewIcons\Split.png" />
<Resource Include="Resources\NewIcons\START-WJ.png" />
<Resource Include="Resources\NewIcons\Stop.png" />
<Resource Include="Resources\NewIcons\Taglio-griglia.png" />
<Resource Include="Resources\NewIcons\Taglio-multiplo.png" />
<Resource Include="Resources\NewIcons\Taglio-singolo.png" />
@@ -852,7 +839,6 @@
<Resource Include="Resources\NewIcons\Tutti-allunga.png" />
<Resource Include="Resources\NewIcons\Tutti-OFF.png" />
<Resource Include="Resources\NewIcons\Tutti-ON.png" />
<Resource Include="Resources\NewIcons\UpArrow.png" />
<Resource Include="Resources\NewIcons\V.png" />
<Resource Include="Resources\NewIcons\Vacuum.png" />
<Resource Include="Resources\NewIcons\Vein-match.png" />
@@ -866,6 +852,9 @@
<Resource Include="Resources\NewIcons\ZoomAll.png" />
<Resource Include="Resources\NewIcons\ZoomWin.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\RawPartTab\MovePhoto.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/ModifStartEndCutWindowV.xaml
+14 -33
View File
@@ -6,48 +6,29 @@
ShowInTaskbar="False"
Title="{Binding Title}"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Height="200" Width="400"
SizeToContent="Height" Width="270"
WindowStartupLocation="CenterOwner">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="4*"/>
<ColumnDefinition Width="4*"/>
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<StackPanel Margin="5,5,5,0">
<TextBlock Grid.Column="1" Grid.Row="1" Margin="0,5,0,0"
<UniformGrid Columns="2" Margin="0,0,0,5">
<TextBlock Grid.Column="1" Grid.Row="1" Margin="0,0,0,0"
Style="{StaticResource OptionTextBlock}" Text="{Binding ValueMsg}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="1" Margin="10,5,10,0"
<EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="1" Margin="0,0,0,0"
Style="{StaticResource OptionTextBox}" Text="{Binding sValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
</UniformGrid>
<UniformGrid Columns="2"
Margin="0,0,0,5">
<Button Name="OkBtn" Content="{Binding OkMsg}" Grid.Column="1"
Style="{DynamicResource ToolBar_TextButton}">
Style="{DynamicResource CompoWindow_Button}">
</Button>
<Button Content="{Binding ExitMsg}" Grid.Column="3"
IsCancel="True"
Style="{DynamicResource ToolBar_TextButton}">
Style="{DynamicResource CompoWindow_Button}">
</Button>
</Grid>
</Grid>
</UniformGrid>
</StackPanel>
</EgtWPFLib5:EgtCustomWindow>
OptionPanel/MachiningTab/MoveRawModeV.xaml
+81 -69
View File
@@ -3,96 +3,108 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
<StackPanel IsEnabled="{Binding MoveRawModeIsEnabled}">
<Grid HorizontalAlignment="Center"
<StackPanel IsEnabled="{Binding MoveRawModeIsEnabled}">
<Border Margin="0,0,0,5" Style="{StaticResource Border}">
<Grid HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="0.5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="0.5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="0.5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="0.5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="0.5"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Button Grid.Column="2" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingButton}"
<Button Grid.Column="2" Grid.Row="0"
Style="{StaticResource OptionPanel_MoveButton}"
Command="{Binding UpCommand}">
<Image Source="/Resources/NestingTab/UpArrow.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="0" Grid.Row="2"
Style="{StaticResource OptionPanel_NestingButton}"
<Image Source="/Resources/NestingTab/UpArrow.png"
Width="45" Height="45" HorizontalAlignment="Center"/>
</Button>
<Button Grid.Column="0" Grid.Row="2"
Style="{StaticResource OptionPanel_MoveButton}"
Command="{Binding LeftCommand}"
Visibility="{Binding LRArrowVisibility}">
<Image Source="/Resources/NestingTab/LeftArrow.png"/>
</Button>
<EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="2" Width="40"
<Image Source="/Resources/NestingTab/LeftArrow.png"
Width="45" Height="45" HorizontalAlignment="Center"/>
</Button>
<TextBox Grid.Column="2" Grid.Row="2" Width="40" Height="20"
Text="{Binding MoveStep}"
VerticalAlignment="Center"
HorizontalContentAlignment="Right"/>
<Button Grid.Column="4" Grid.Row="2"
Style="{StaticResource OptionPanel_NestingButton}"
HorizontalAlignment="Center"
HorizontalContentAlignment="right"
Background="{StaticResource Omag_Black}"
Foreground="{StaticResource Omag_White}"
VerticalAlignment="Center"/>
<Button Grid.Column="4" Grid.Row="2"
Style="{StaticResource OptionPanel_MoveButton}"
Command="{Binding RightCommand}"
Visibility="{Binding LRArrowVisibility}">
<Image Source="/Resources/NestingTab/RightArrow.png"/>
</Button>
<Image Source="/Resources/NestingTab/RightArrow.png"
Width="45" Height="45" HorizontalAlignment="Center"/>
</Button>
<Button Grid.Column="2" Grid.Row="4"
Style="{StaticResource OptionPanel_NestingButton}"
<Button Grid.Column="2" Grid.Row="4"
Style="{StaticResource OptionPanel_MoveButton}"
Command="{Binding DownCommand}">
<Image Source="/Resources/NestingTab/DownArrow.png"/>
</Button>
<Image Source="/Resources/NestingTab/DownArrow.png"
Width="45" Height="45" HorizontalAlignment="Center"/>
</Button>
<Button Grid.Column="0" Grid.Row="6"
Style="{StaticResource OptionPanel_NestingButton}"
<Button Grid.Column="0" Grid.Row="6"
Style="{StaticResource OptionPanel_MoveButton}"
Command="{Binding CcwRotCommand}"
Visibility="{Binding RotationVisibility}">
<Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
Width="64" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<Grid Name="RotationAngle" Grid.Column="2" Grid.Row="6"
HorizontalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding RotationVisibility}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<EgtWPFLib5:EgtTextBox Text="{Binding RotationStep}" Width="40"/>
<TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
Text="°"/>
</Grid>
<Button Grid.Column="4" Grid.Row="6"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding CwRotCommand}"
Visibility="{Binding RotationVisibility}">
<Image Source="/Resources/NestingTab/ClockwiseRotate.png"
<Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
</Button>
</Grid>
<Grid Name="RotationAngle" Grid.Column="2" Grid.Row="6"
HorizontalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding RotationVisibility}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBox Text="{Binding RotationStep}" Width="40" Height="20"
HorizontalAlignment="center"
HorizontalContentAlignment="right"
Background="{StaticResource Omag_Black}"
Foreground="{StaticResource Omag_White}"/>
<TextBlock Grid.Column="1" FontSize="25" Margin="2,-5,0,0"
Foreground="{StaticResource Omag_White}" Text="°"/>
</Grid>
<Button Grid.Column="2" Grid.Row="4"
<Button Grid.Column="4" Grid.Row="6"
Style="{StaticResource OptionPanel_MoveButton}"
Command="{Binding CwRotCommand}"
Visibility="{Binding RotationVisibility}">
<Image Source="/Resources/NestingTab/ClockwiseRotate.png"
Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
</Grid>
</Border>
<Button Grid.Column="2" Grid.Row="4"
Content="{Binding RemoveMsg}"
Style="{StaticResource OptionPanel_TextButton}"
Command="{Binding RemovePartCommand}"
Margin="0,0,0,5"/>
Margin="0,5,0,5"/>
</StackPanel>
</StackPanel>
</UserControl>
OptionPanel/MachiningTab/SplitModeV.xaml
+269 -354
View File
@@ -3,534 +3,449 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Background="Transparent">
<StackPanel IsEnabled="{Binding SplitModeIsEnabled}">
<ListBox ItemsSource="{Binding ItemList}"
<Border Margin="0,0,0,5" Style="{StaticResource BorderSplit}" Padding="0">
<ListBox ItemsSource="{Binding ItemList}"
Background="{StaticResource Omag_Gray}"
DisplayMemberPath="Name"
SelectionMode="Extended"
Height="200" Margin="0,0,0,5">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Style.Triggers>
<DataTrigger Binding="{Binding bIsActive}" Value="False">
<Setter Property="Foreground" Value="{StaticResource Omag_Gray}"/>
</DataTrigger>
</Style.Triggers>
<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
BorderThickness="0"
Height="200" Margin="0,0,0,0">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Style.Triggers>
<DataTrigger Binding="{Binding bIsActive}" Value="False">
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="FontStyle" Value="Oblique"/>
<Setter Property="FontWeight" Value="Light"/>
</DataTrigger>
<DataTrigger Binding="{Binding bIsActive}" Value="True">
<Setter Property="Foreground" Value="{StaticResource Omag_Black}"/>
<Setter Property="FontWeight" Value="Bold"/>
</DataTrigger>
</Style.Triggers>
<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Border>
<Grid Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button Grid.Column="1"
<Button Grid.Column="1"
IsEnabled="{Binding bEnabledCommandMove}"
Style="{StaticResource OptionPanel_Button}"
Command="{Binding MoveUpCommand}">
<Image Source="/Resources/MachiningTab/UpArrow.png"/>
</Button>
<Button Grid.Column="2"
Command="{Binding MoveUpCommand}"
Margin="0,0,0.5,0">
<Image Source="/Resources/NestingTab/UpArrow.png"/>
</Button>
<Button Grid.Column="2"
IsEnabled="{Binding bEnabledCommandMove}"
Style="{StaticResource OptionPanel_Button}"
Command="{Binding MoveDownCommand}">
<Image Source="/Resources/MachiningTab/DownArrow.png"/>
</Button>
Command="{Binding MoveDownCommand}"
Margin="0.5,0,0,0">
<Image Source="/Resources/NestingTab/DownArrow.png"/>
</Button>
</Grid>
</StackPanel>
<Border Margin="0,0,0,5" Style="{StaticResource Border}">
<UniformGrid Columns="3">
<!--<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>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
Style="{StaticResource ImgButton}"/>
</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>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Tutti-ON.png"
Style="{StaticResource ImgButton}"/>
</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>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<StackPanel>
<Image Source="/Resources/NewIcons/Tutti-OFF.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
</StackPanel>
</UniformGrid>
</GroupBox>
</Border>
<GroupBox Header="Tagli di separazione" Style="{StaticResource GroupBoxSplit}">
<Border Margin="0,0,0,5" Style="{StaticResource Border}">
<StackPanel>
<StackPanel>
<UniformGrid Columns="3" Margin="0,0,0,5">
<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}">
<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>
</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}">
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
<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"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</ToggleButton>
</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}">
<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>
</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}">
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
<StackPanel>
<Image Source="/Resources/NewIcons/Quality.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
</Button>
</StackPanel>
</Grid>
</Grid>
<Grid>
<!--<Button Content="{Binding CutEndMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding CutEndCommand}"
Visibility="{Binding CutEndBtnVisibility}"
Margin="2.5,0,0,0"/>-->
<StackPanel Visibility="{Binding CutEndBtnVisibility}">
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
</Button>
</StackPanel>
<!--<ToggleButton Grid.Row="0"
Content="{Binding BridgeDeleteMsg}"
Style="{StaticResource OptionPanel_ToggleWrapButton}"
IsChecked="{Binding BridgeDeleteBtn_IsChecked}"
Visibility="{Binding BridgeDeleteBtnVisibility}"
Margin="2.5,0,0,0" Padding="0"/>-->
<StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}">
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
<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"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</ToggleButton>
</StackPanel>
</ToggleButton>
</StackPanel>
</Grid>
</UniformGrid>
</Grid>
</StackPanel>
<Grid Visibility="{Binding AllExtRedVisibility}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<UniformGrid Columns="4" Margin="0,0,0,-2.5">
<!--<Button Content="{Binding AllExtendMsg}" Grid.Column="1"
<!--Bottone invisibile per permetter il corretto allineamento-->
<Button Content="{Binding }" Grid.Column="0"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding AllExtendCommand}"
Visibility="{Binding AllExtendBtnVisibility}"
Margin="0,0,2.5,0"/>-->
<StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1">
<Button ToolTip="{Binding AllExtendMsg}"
Command="{Binding }"
Visibility="Hidden"
Margin="0,0,1,0"/>
<StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" 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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Tutti-allunga.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding AllReduceMsg}" Grid.Column="2"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding AllReduceCommand}"
Visibility="{Binding AllReduceBtnVisibility}"
Margin="2.5,0,0,0"/>-->
<StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2">
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Tutti-accorcia.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
</Grid>
</UniformGrid>
</StackPanel>
</StackPanel>
</Border>
</GroupBox>
<Border Margin="0,0,0,5" Style="{StaticResource Border}">
<StackPanel>
<UniformGrid Columns="3" Margin="0,0,0,5">
<!--<Button Content="{Binding OutCenStartMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding OutCenStartCommand}"
Visibility="{Binding OutCenStartBtnVisibility}"
Margin="0,0,2.5,0" Padding="0"/>-->
<StackPanel Visibility="{Binding OutCenStartBtnVisibility}">
<Button ToolTip="{Binding OutCenStartMsg}"
<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}"
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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding AllOutStartMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding AllOutStartCommand}"
Visibility="{Binding AllOutStartBtnVisibility}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel Visibility="{Binding AllOutStartBtnVisibility}">
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding AllCenStartMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding AllCenStartCommand}"
Visibility="{Binding AllCenStartBtnVisibility}"
Margin="2.5,0,0,0"/>-->
<StackPanel Visibility="{Binding AllCenStartBtnVisibility}">
<Button ToolTip="{Binding AllCenStartMsg}"
<StackPanel>
<Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
</UniformGrid>
<UniformGrid Columns="3" Margin="0,0,0,5">
<!--<Button Content="{Binding OutCenEndMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding OutCenEndCommand}"
Visibility="{Binding OutCenEndBtnVisibility}"
Margin="0,0,2.5,0" Padding="0"/>-->
<StackPanel Visibility="{Binding OutCenEndBtnVisibility}">
<Button ToolTip="{Binding OutCenEndMsg}"
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding AllOutEndMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding AllOutEndCommand}"
Visibility="{Binding AllOutEndBtnVisibility}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel Visibility="{Binding AllOutEndBtnVisibility}">
<Button ToolTip="{Binding AllOutEndMsg}"
</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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding AllCenEndMsg}"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding AllCenEndCommand}"
Visibility="{Binding AllCenEndBtnVisibility}"
Margin="2.5,0,0,0"/>-->
<StackPanel Visibility="{Binding AllCenEndBtnVisibility}">
<Button ToolTip="{Binding AllCenEndMsg}"
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
</UniformGrid>
<UniformGrid Columns="3" Margin="0,0,0,5">
<!--<Button Content="{Binding ModifStartMsg}" Grid.Column="0"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding ModifStartCommand}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Modifica-Inizio.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding ModifEndMsg}" Grid.Column="1"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding ModifEndCommand}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel>
<Button ToolTip="{Binding ModifEndMsg}"
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Modifica-Fine.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<!--<Button Content="{Binding PauseMsg}" Grid.Column="2"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding PauseCommand}"
Visibility="{Binding PauseBtnVisibility}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
</UniformGrid>
</UniformGrid>
<UniformGrid Columns="4" Margin="0,0,0,1">
<UniformGrid Columns="3" Margin="0,0,0,5">
<!--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="2.5,0,2.5,0"/>
<!--Inverti direzione di taglio-->
<!--<Button Content="{Binding InvertMsg}" Grid.Column="0"
Style="{StaticResource OptionPanel_TextWrapButton}"
Command="{Binding InvertCommand}"
Visibility="{Binding InvertBtnVisibility}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel Visibility="{Binding InvertBtnVisibility}">
<Button ToolTip="{Binding InvertMsg}"
Margin="0,0,1,0"/>
<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"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
<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"
Height="40" Margin="0,2,0,0"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
<StackPanel>
<Image Source="/Resources/NewIcons/Inverti.png"
Style="{StaticResource ImgButton}"/>
</StackPanel>
</Button>
</StackPanel>
</UniformGrid>
</UniformGrid>
</StackPanel>
</StackPanel>
</Border>
</GroupBox>
</StackPanel>
</StackPanel>
</UserControl>
OptionPanel/NestingTab/NestingTabV.xaml
+182 -192
View File
@@ -4,141 +4,151 @@
xmlns:EgtWPFLib5 ="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
Margin="5,5,5,0">
<Grid HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingButton}"
<GroupBox Header="Disegno parametrico" Style="{StaticResource GroupBoxSplit}">
<Grid HorizontalAlignment="Center"
VerticalAlignment="Center" Margin="0,2.5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Grid.Row="0"
Style="{StaticResource DrawImport_NestingButton}"
Command="{Binding DrawCommand}">
<Image Source="/Resources/NestingTab/Draw.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="2" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingButton}"
<Image Source="/Resources/NestingTab/Draw.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="2" Grid.Row="0"
Style="{StaticResource DrawImport_NestingButton}"
Command="{Binding ImportDxfCommand}">
<Image Source="/Resources/NestingTab/ImportDxf.png" Stretch="Uniform"/>
</Button>
<ToggleButton Grid.Column="4" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingToggleButton}"
<Image Source="/Resources/NestingTab/ImportDxf.png" Stretch="Uniform"/>
</Button>
<ToggleButton Grid.Column="4" Grid.Row="0"
Style="{StaticResource DrawImport_NestingToggleButton}"
IsChecked="{Binding CsvImport_IsChecked}">
<Image Source="/Resources/NestingTab/ImportCsv.png" Stretch="Uniform"/>
</ToggleButton>
<Image Source="/Resources/NestingTab/ImportCsv.png" Stretch="Uniform"/>
</ToggleButton>
</Grid>
</Grid>
</GroupBox>
<Border Margin="0,0,0,5" Style="{StaticResource Border}">
<Border Margin="0,5,0,5" Style="{StaticResource Border}">
<Grid HorizontalAlignment="Center"
<Grid HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
Margin="0,0,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--<TextBlock Name="PositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
<!--<TextBlock Name="PositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
HorizontalAlignment="Center" FontSize="15" />-->
<Button Grid.Column="0" Grid.Row="0"
<Button Grid.Column="0" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingButton}" Width="48" Height="48"
Command="{Binding PartRotOnCommand}">
<Image Source="/Resources/NestingTab/PartRotOn.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="2" Grid.Row="0"
<Image Source="/Resources/NestingTab/PartRotOn.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="2" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding UpCommand}">
<Image Source="/Resources/NestingTab/UpArrow.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="4" Grid.Row="0"
<Image Source="/Resources/NestingTab/UpArrow.png"
Width="40"/>
</Button>
<Button Grid.Column="4" Grid.Row="0"
Style="{StaticResource OptionPanel_NestingButton}" Width="48" Height="48"
Command="{Binding PartRotOffCommand}">
<Image Source="/Resources/NestingTab/PartRotOff.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="0" Grid.Row="2"
<Image Source="/Resources/NestingTab/PartRotOff.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="0" Grid.Row="2"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding LeftCommand}">
<Image Source="/Resources/NestingTab/LeftArrow.png"/>
</Button>
<ToggleButton Grid.Column="2" Grid.Row="2"
<Image Source="/Resources/NestingTab/LeftArrow.png"
Width="40"/>
</Button>
<ToggleButton Grid.Column="2" Grid.Row="2"
Style="{StaticResource OptionPanel_NestingToggleButton}"
IsChecked="{Binding MaxMoveIsChecked}">
<Image Source="/Resources/NestingTab/MaxMove.png"/>
</ToggleButton>
<Button Grid.Column="4" Grid.Row="2"
<Image Source="/Resources/NestingTab/MaxMove.png"/>
</ToggleButton>
<Button Grid.Column="4" Grid.Row="2"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding RightCommand}">
<Image Source="/Resources/NestingTab/RightArrow.png"/>
</Button>
<Image Source="/Resources/NestingTab/RightArrow.png"
Width="40"/>
</Button>
<EgtWPFLib5:EgtTextBox Grid.Column="0" Grid.Row="4" Width="40"
<EgtWPFLib5:EgtTextBox Grid.Column="0" Grid.Row="4" Width="40"
Text="{Binding StepMove}"
VerticalAlignment="Center"
HorizontalContentAlignment="Right"/>
<Button Grid.Column="2" Grid.Row="4"
<Button Grid.Column="2" Grid.Row="4"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding DownCommand}">
<Image Source="/Resources/NestingTab/DownArrow.png"/>
</Button>
<Image Source="/Resources/NestingTab/DownArrow.png"
Width="40"/>
</Button>
<Grid Grid.Column="4" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="4" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<EgtWPFLib5:EgtTextBox Text="{Binding RotationAngle}" Width="40"
<EgtWPFLib5:EgtTextBox Text="{Binding RotationAngle}" Width="40"
VerticalAlignment="Center"
HorizontalContentAlignment="Left"/>
<TextBlock Grid.Column="1" Margin="2,0,0,0"
<TextBlock Grid.Column="1" Margin="2,0,0,0"
FontSize="20" Text="°"/>
</Grid>
</Grid>
<Button Grid.Column="0" Grid.Row="6"
<Button Grid.Column="0" Grid.Row="6"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding CClockwiseRotCommand}">
<Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
<Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
Width="64" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<ToggleButton Grid.Column="2" Grid.Row="6"
</Button>
<ToggleButton Grid.Column="2" Grid.Row="6"
Style="{StaticResource OptionPanel_NestingToggleButton}"
IsChecked="{Binding MagneticIsChecked}">
<Image Source="/Resources/NestingTab/AlignPieces.png"
<Image Source="/Resources/NestingTab/AlignPieces.png"
Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</ToggleButton>
<Button Grid.Column="4" Grid.Row="6"
</ToggleButton>
<Button Grid.Column="4" Grid.Row="6"
Style="{StaticResource OptionPanel_NestingButton}"
Command="{Binding ClockwiseRotCommand}">
<Image Source="/Resources/NestingTab/ClockwiseRotate.png"
<Image Source="/Resources/NestingTab/ClockwiseRotate.png"
Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
</Button>
</Grid>
</Grid>
</Border>
</Border>
<UniformGrid Grid.Column="0" Columns="3" Margin="0,0,0,5">
<!--<Button Content="{Binding InsertPartMsg}"
<GroupBox Header="Gestione parcheggio" Style="{StaticResource GroupBoxSplit}">
<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"/>
@@ -147,187 +157,167 @@
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="2.5,0,0,0">
<StackPanel>
<Image Source="/Resources/NewIcons/Inserisci-pezzo.png"
Margin="0,0,0,0">
<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="2.5,0,0,0">
<StackPanel>
<Image Source="/Resources/NewIcons/Parcheggia-pezzo.png"
Margin="0,0,0,0">
<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>
</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="2.5,0,0,0">
<StackPanel>
<Image Source="/Resources/NewIcons/Elimina-pezzo.png"
Margin="0,0,0,0">
<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>
<UniformGrid Grid.Column="0" Columns="{Binding CountColumn}" Margin="0,0,0,5">
<!--<Button Content="{Binding RemovePartMsg}"
Style="{StaticResource OptionPanel_TextButton}"
Command="{Binding RemovePartCommand}"
Margin="0,0,2.5,0"/>-->
<!--<ToggleButton Content="{Binding DragRectangleMsg}" Grid.Column="1"
Visibility="{Binding DragRectangle_Visibility}"
Style="{StaticResource OptionPanel_ToggleButton}"
IsChecked="{Binding bDragRectangle}"
Margin="2.5,0,2.5,0"/>-->
</GroupBox>
<StackPanel>
<Button ToolTip="{Binding SelectAllMsg}" Grid.Column="1"
<GroupBox Header="Gestione selezione" Style="{StaticResource GroupBoxSplit}">
<UniformGrid Grid.Column="0" Columns="{Binding CountColumn}" Margin="0,2.5,0,0">
<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>
</UniformGrid>
</GroupBox>
<UniformGrid Grid.Column="0" Columns="2" Margin="0,0,0,5" Visibility="{Binding WJ_Cmd_Visibility}">
<!--<ToggleButton Content="{Binding SplitCurvWJMsg}" Grid.Column="2"
Style="{StaticResource OptionPanel_ToggleButton}"
IsChecked="{Binding bSplitCurvWJ}"
Margin="2.5,0,2.5,0"/>-->
<!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
Style="{StaticResource OptionPanel_ToggleButton}"
IsChecked="{Binding bStartCurvWJ}"
Margin="2.5,0,2.5,0"/>-->
<StackPanel>
<ToggleButton ToolTip="{Binding SplitCurvWJMsg}" Grid.Column="1"
<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"
Style="{StaticResource Nest_ToggleButton_Img}"
IsChecked="{Binding bSplitCurvWJ}"
HorizontalContentAlignment="Stretch"
Margin="2.5,0,0,0">
<StackPanel>
<Image Source="/Resources/NewIcons/SPLIT-WJ.png"
Margin="0,0,0,0">
<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>
<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="2.5,0,0,0">
<StackPanel>
<Image Source="/Resources/NewIcons/START-WJ.png"
Margin="0,0,0,0">
<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>
<UniformGrid Columns="2" Margin="0,0,0,5">
<!--<Button Content="{Binding SelectAllMsg}"
Style="{StaticResource OptionPanel_TextButton}"
Command="{Binding SelectAllCommand}"
Margin="0,0,2.5,0"/>-->
<!--<Button Content="{Binding DeselectAllMsg}"
Style="{StaticResource OptionPanel_TextButton}"
Command="{Binding DeselectAllCommand}"
Margin="2.5,0,0,0"/>-->
</UniformGrid>
</UniformGrid>
</GroupBox>
<Button Content="{Binding ResetMsg}"
<Button Content="{Binding ResetMsg}"
Style="{StaticResource OptionPanel_TextButton}"
Command="{Binding ResetCommand}"
Margin="0,0,0,5"/>
Margin="0,5,0,5"/>
<Button Content="{Binding CsvDataMsg}"
<Button Content="{Binding CsvDataMsg}"
Style="{StaticResource OptionPanel_TextButton}"
Command="{Binding CsvDataCommand}"
Visibility="{Binding CsvData_Visibility}"
Margin="0,0,0,5"/>
</StackPanel>
OptionPanel/OptionPanelV.xaml
+15 -8
View File
@@ -6,11 +6,14 @@
Width="190">
<TabControl Name="Tabs" SelectedIndex="{Binding SelItem}" Background="Transparent"
Padding="0,0,0,0"
Margin="5,0.5,5,0"
Style="{StaticResource TabControlOptinPanel}">
<TabItem ToolTip="{Binding RawPartTabMsg}" IsEnabled="{Binding RawTabIsEnabled}"
<TabItem ToolTip="{Binding RawPartTabMsg}" IsEnabled="{Binding RawTabIsEnabled}"
Margin="0,0,0,0"
Style="{StaticResource TabItemOptinPanel}">
<TabItem.Header>
<StackPanel Orientation="Horizontal" Width="20" Height="20">
<StackPanel Orientation="Horizontal" Width="35" Height="35">
<Image Source="/Resources/NewIcons/icone-tagli-5.png" Stretch="UniformToFill"/>
</StackPanel>
</TabItem.Header>
@@ -18,25 +21,28 @@
<OmagOFFICE:RawPartTabV DataContext="{StaticResource RawPartTabVM}"/>
</TabItem.Content>
</TabItem>
<TabItem ToolTip="{Binding NestingTabMsg}" IsEnabled="{Binding NestTabIsEnabled}" >
<TabItem ToolTip="{Binding NestingTabMsg}" IsEnabled="{Binding NestTabIsEnabled}"
Margin="0,0,0,0"
Style="{StaticResource TabItemOptinPanel}">
<TabItem.Header>
<StackPanel Orientation="Horizontal" Width="20" Height="20">
<StackPanel Orientation="Horizontal" Width="35" Height="35">
<Image Source="/Resources/NewIcons/Nest.png" Stretch="Uniform" />
</StackPanel>
</TabItem.Header>
<TabItem.Content>
<OmagOFFICE:NestingTabV DataContext="{StaticResource NestingTabVM}"/>
</TabItem.Content>
<TabItem.Style>
<!--<TabItem.Style>
<Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource TabItemOptinPanel}">
<EventSetter Event="PreviewMouseDown" Handler="NestingTab_Click"/>
</Style>
</TabItem.Style>
</TabItem.Style>-->
</TabItem>
<TabItem ToolTip="{Binding MachiningTabMsg}" IsEnabled="{Binding MachTabIsEnabled}"
Margin="0,0,0,0"
Style="{StaticResource TabItemOptinPanel}">
<TabItem.Header>
<StackPanel Orientation="Horizontal" Width="20" Height="20">
<StackPanel Orientation="Horizontal" Width="35" Height="35">
<Image Source="/Resources/NewIcons/Split.png" Stretch="Uniform" />
</StackPanel>
</TabItem.Header>
@@ -45,9 +51,10 @@
</TabItem.Content>
</TabItem>
<TabItem ToolTip="{Binding SimulTabMsg}" IsEnabled="{Binding SimulTabIsEnabled}"
Margin="0,0,0,0"
Style="{StaticResource TabItemOptinPanel}">
<TabItem.Header>
<StackPanel Orientation="Horizontal" Width="20" Height="20">
<StackPanel Orientation="Horizontal" Width="35" Height="35">
<Image Source="/Resources/NewIcons/Simula.png" Stretch="Uniform" />
</StackPanel>
</TabItem.Header>
OptionPanel/RawPartTab/RawPartTabV.xaml
+127 -107
View File
@@ -5,69 +5,81 @@
xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
Margin="5,5,5,0">
<Border Style="{StaticResource DefaultBorder}"
Padding="5,5,5,0">
<StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Style="{StaticResource OptionPanel_Button}"
Grid.Column="0"
<StackPanel>
<GroupBox Header="Photo" Style="{StaticResource GroupBoxRow}">
<Grid HorizontalAlignment="Center"
VerticalAlignment="Center" Margin="0,2.5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Style="{StaticResource OptionPanelRaw_Button}"
Grid.Column="0" Grid.Row="0"
Visibility="{Binding SlabIdVisibility}"
IsEnabled="{Binding SlabIdIsEnabled}"
Command="{Binding SlabIdCommand}"
Width="30" Height="30"
Margin="0,0,0,5" >
<Image Source="/Resources/RawPartTab/SlabId.png" Stretch="Uniform"/>
</Button>
<Button Style="{StaticResource OptionPanel_Button}"
Grid.Column="1"
Margin="0,0,0,0" >
<Image Source="/Resources/RawPartTab/SlabId.png" Stretch="Uniform"/>
</Button>
<Button Style="{StaticResource OptionPanelRaw_Button}"
Grid.Column="2" Grid.Row="0"
Command="{Binding PhotoCommand}"
Margin="0,0,0,5" >
<Image Source="/Resources/RawPartTab/Photo.png" Stretch="Uniform"/>
</Button>
<ToggleButton Style="{StaticResource OptionPanel_ToggleButton}"
Grid.Column="2"
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}"
Width="30"
Margin="0,0,0,5" >
<Image Source="/Resources/RawPartTab/Mouse.png" Stretch="Uniform"/>
</ToggleButton>
</Grid>
Margin="0,0,0,0" >
<Image Source="/Resources/RawPartTab/MovePhoto.png" Stretch="Uniform" Width="40"/>
</ToggleButton>
</Grid>
</GroupBox>
<UniformGrid Columns="2" Rows="3" Margin="0,0,0,0">
<GroupBox Header="Offset photo" Style="{StaticResource GroupBoxRow}">
<UniformGrid Columns="2" Rows="3" Margin="0,0,0,0">
<TextBlock Text="{Binding OffsetXMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetX}"
Margin="13,0,0,5"
<TextBlock Text="{Binding OffsetXMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetX}"
BorderThickness="0"
Margin="0,0,0,5"
TextAlignment="Right"/>
<TextBlock Text="{Binding OffsetYMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetY}"
Margin="13,0,0,5"
<EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetY}"
Margin="0,0,0,5"
TextAlignment="Right"/>
<TextBlock Text="{Binding PhotoRotMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding PhotoRot}"
Margin="13,0,0,5"
<EgtWpfLib5:EgtTextBox Text="{Binding PhotoRot}"
Margin="0,0,0,5"
TextAlignment="Right"/>
</UniformGrid>
</StackPanel>
</Border>
</UniformGrid>
</GroupBox>
</StackPanel>
<!-- Definizione della Grid per il materiale -->
<GroupBox Header="{Binding MaterialMsg}" Foreground="White" Margin="0,0,0,5" BorderThickness="0.5">
<!-- Definizione della Grid per il materiale -->
<GroupBox Header="{Binding MaterialMsg}" Style="{StaticResource GroupBoxRow}">
<StackPanel>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<ComboBox ItemsSource="{Binding MaterialList}"
DisplayMemberPath="sName"
SelectedItem="{Binding SelMaterial}"/>
<TextBlock Grid.Row="1" Text="{Binding MaterialFromDB}"
<ComboBox ItemsSource="{Binding MaterialList}"
Style="{DynamicResource Raw_ComboBox}"
DisplayMemberPath="sName"
SelectedItem="{Binding SelMaterial}">
<ComboBox.ItemContainerStyle>
<Style TargetType="ComboBoxItem">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="150" />
</Style>
</ComboBox.ItemContainerStyle>
</ComboBox>
<TextBlock Grid.Row="1" Text="{Binding MaterialFromDB}"
Style="{StaticResource RawTextBlock}"
Visibility="{Binding VisibilityMaterialFromDB}"
Margin="0,5,0,0"/>
@@ -75,110 +87,118 @@
</StackPanel>
</GroupBox>
<UniformGrid Columns="2" Margin="0,0,0,0">
<TextBlock Text="{Binding HeightMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Height}"
Margin="13,0,0,5"
IsEnabled="{Binding HeightIsEnabled}" TextAlignment="Right"/>
</UniformGrid>
<Button Content="{Binding CurrMachMsg}"
<Button Content="{Binding CurrMachMsg}"
Command="{Binding CurrMachCommand}"
Background="{Binding CurrMach_Background}"
Style="{StaticResource OptionPanel_TextButton}"
Margin="0,0,0,5"/>
Margin="0,5,0,0"/>
<UniformGrid Columns="2" Margin="0,0,0,5">
<GroupBox Header="Definizion grezzo" Style="{StaticResource GroupBoxRow}">
<StackPanel>
<RadioButton Content="{Binding OutlineMsg}"
<UniformGrid Columns="2" Margin="0,0,0,5">
<RadioButton Content="{Binding OutlineMsg}"
Style="{StaticResource OptionPanel_ToggleButton}"
IsChecked="{Binding OutlineIsChecked}"
Margin="0,0,2.5,0">
</RadioButton>
<RadioButton Content="{Binding DamagedAreaMsg}"
Margin="0,0,1,0">
</RadioButton>
<RadioButton Content="{Binding DamagedAreaMsg}"
Style="{StaticResource OptionPanel_ToggleButton}"
IsChecked="{Binding DAIsChecked}"
Margin="2.5,0,0,0">
</RadioButton>
Margin="1,0,0,0">
</RadioButton>
</UniformGrid>
</UniformGrid>
<ComboBox ItemsSource="{Binding TypeList}"
<ComboBox ItemsSource="{Binding TypeList}"
SelectedIndex="{Binding SelType}"
Style="{StaticResource Raw_ComboBox}"
Margin="0,0,0,5"
IsEnabled="{Binding TypeIsEnabled}"/>
IsEnabled="{Binding TypeIsEnabled}">
<ComboBox.ItemContainerStyle>
<Style TargetType="ComboBoxItem">
<Setter Property="Height" Value="30"/>
<!-- Definizione della Grid per definizione grezzo -->
<UniformGrid Columns="2" Rows="5" Margin="0,0,0,0">
</Style>
</ComboBox.ItemContainerStyle>
</ComboBox>
<TextBlock Text="{Binding LengthMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Length}"
Margin="13,0,0,5"
<!-- Definizione della Grid per definizione grezzo -->
<UniformGrid Columns="2" Rows="6" Margin="0,0,0,0">
<TextBlock Text="{Binding LengthMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Length}"
Margin="0,0,0,5"
IsEnabled="{Binding LengthIsEnabled}" TextAlignment="Right"/>
<TextBlock Text="{Binding WidthMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Width}"
Margin="13,0,0,5"
<TextBlock Text="{Binding WidthMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Width}"
Margin="0,0,0,5"
IsEnabled="{Binding WidthIsEnabled}" TextAlignment="Right"/>
<TextBlock Text="{Binding OffsetXMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding OffsetX}"
Margin="13,0,0,5"
<TextBlock Text="{Binding HeightMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Height}"
Margin="0,0,0,5"
IsEnabled="{Binding HeightIsEnabled}" TextAlignment="Right"/>
<TextBlock Text="{Binding OffsetXMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding OffsetX}"
Margin="0,0,0,5"
IsEnabled="{Binding OffsetXIsEnabled}" TextAlignment="Right"/>
<TextBlock Text="{Binding OffsetYMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding OffsetY}"
Margin="13,0,0,5"
<TextBlock Text="{Binding OffsetYMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding OffsetY}"
Margin="0,0,0,5"
IsEnabled="{Binding OffsetYIsEnabled}" TextAlignment="Right"/>
<TextBlock Text="{Binding KerfMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Kerf, UpdateSourceTrigger=PropertyChanged}"
Margin="13,0,0,5"
<TextBlock Text="{Binding KerfMsg}" Style="{StaticResource RawTextBlock}"/>
<EgtWpfLib5:EgtTextBox Text="{Binding Kerf, UpdateSourceTrigger=PropertyChanged}"
Margin="0,0,0,5"
IsEnabled="{Binding KerfIsEnabled}" TextAlignment="Right"/>
</UniformGrid>
</UniformGrid>
<!-- Definizione della Grid per Punti -->
<GroupBox Header="{Binding PointsMsg}" Margin="0,0,0,5" BorderThickness="0.5"
</StackPanel>
</GroupBox>
<!-- Definizione della Grid per Punti -->
<GroupBox Header="{Binding PointsMsg}" Style="{StaticResource GroupBoxRow}"
Visibility="{Binding PointsVisibility}">
<StackPanel>
<StackPanel>
<UniformGrid Columns="2">
<UniformGrid Columns="2">
<ToggleButton Content="{Binding AddMsg}"
<ToggleButton Content="{Binding AddMsg}"
IsChecked="{Binding AddPoint}"
Style="{StaticResource OptionPanel_ToggleButton}"/>
<ToggleButton Content="{Binding RemoveMsg}" Grid.Column="1"
<ToggleButton Content="{Binding RemoveMsg}" Grid.Column="1"
IsChecked="{Binding RemovePoint}"
Style="{StaticResource OptionPanel_ToggleButton}"/>
</UniformGrid>
</UniformGrid>
</StackPanel>
</StackPanel>
</GroupBox>
</GroupBox>
<!-- Definizione della Grid per Zona rovinata -->
<GroupBox Header="{Binding DamagedAreaMsg}" Margin="0,0,0,5" BorderThickness="0.5"
<!-- Definizione della Grid per Zona rovinata -->
<GroupBox Header="{Binding DamagedAreaMsg}" Style="{StaticResource GroupBoxRow}"
Visibility="{Binding DAVisibility}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Content="{Binding NewMsg}"
<ToggleButton Content="{Binding NewMsg}"
IsChecked="{Binding NewDA}"
Style="{StaticResource OptionPanel_ToggleButton}"/>
<ToggleButton Content="{Binding DeleteMsg}" Grid.Column="1"
<ToggleButton Content="{Binding DeleteMsg}" Grid.Column="1"
IsChecked="{Binding DeleteDA}"
Style="{StaticResource OptionPanel_ToggleButton}"/>
</Grid>
</GroupBox>
</Grid>
</GroupBox>
<!-- Definizione della Grid per Punti Per il Registration -->
<GroupBox Header="{Binding PointsRegMsg}" Margin="0,0,0,5"
<GroupBox Header="{Binding PointsRegMsg}" Style="{StaticResource GroupBoxRow}"
Visibility="{Binding PointsRegVisibility}">
<StackPanel>
<UniformGrid Columns="3">
@@ -201,6 +221,6 @@
Style="{StaticResource OptionPanel_TextButton}"
Margin="0,0,0,5"/>
<!--<EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>-->
<!--<EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>-->
</StackPanel>
OptionPanel/RawPartTab/RawPartTabV.xaml.vb
+2
View File
@@ -1,3 +1,5 @@
Public Class RawPartTabV
Private Sub ComboBox_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)
End Sub
End Class
OptionPanel/RawPartTab/RawPartTabVM.vb
+3 -3
View File
@@ -904,7 +904,7 @@ Public Class RawPartTabVM
End Set
End Property
Private m_CurrMach_Background As Brush = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
Private m_CurrMach_Background As Brush = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
Public Property CurrMach_Background As Brush
Get
Return m_CurrMach_Background
@@ -2094,7 +2094,7 @@ Public Class RawPartTabVM
OmagOFFICEMap.refOptionPanelVM.MachTabIsEnabled = True
OmagOFFICEMap.refOptionPanelVM.SimulTabIsEnabled = True
OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
Else
OmagOFFICEMap.refOptionPanelVM.NestTabIsEnabled = False
OmagOFFICEMap.refOptionPanelVM.MachTabIsEnabled = False
@@ -2105,7 +2105,7 @@ Public Class RawPartTabVM
If Not ValidateCurrMachToolIsInSetUp() Then
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = Brushes.Red
Else
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
End If
If String.IsNullOrWhiteSpace(CurrentMachine.sCurrSawing) And String.IsNullOrWhiteSpace(CurrentMachine.sCurrWaterJetting) Then
CurrMach_Background = Brushes.Red
OptionPanel/SimulTab/SimulTabV.xaml
+30 -34
View File
@@ -3,31 +3,32 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Margin="5,5,5,0">
<GroupBox Header="{Binding MachViewMsg}" Margin="0,0,0,5" BorderThickness="0.5" Foreground="White">
<GroupBox Header="{Binding MachViewMsg}" Style="{StaticResource GroupBoxRow}">
<UniformGrid Columns="3">
<Button Command="{Binding ToolModeCommand}"
Style="{StaticResource OptionPanel_NestingButton}">
Style="{StaticResource Simul_Button_Img}">
<Image Source="/Resources/SimulTab/ToolMode.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding HeadModeCommand}"
Style="{StaticResource OptionPanel_NestingButton}">
<Button Command="{Binding Simul_Button_Img}"
Style="{StaticResource Simul_Button_Img}">
<Image Source="/Resources/SimulTab/HeadMode.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MachModeCommand}"
Style="{StaticResource OptionPanel_NestingButton}">
Style="{StaticResource Simul_Button_Img}">
<Image Source="/Resources/SimulTab/MachMode.png" Stretch="Uniform"/>
</Button>
</UniformGrid>
</GroupBox>
<GroupBox BorderThickness="0">
<Border Style="{StaticResource Border}" Margin="0,5,0,0">
<StackPanel DataContext="{Binding MySimul}">
<UniformGrid Columns="3" Margin="0,10,0,5">
<Button Command="{Binding StepCommand}" Grid.Column="0" Grid.Row="3"
Style="{StaticResource OptionPanel_NestingButton}"
Style="{StaticResource Simul_Button_Img}"
ToolTip="{Binding OneStepToolTip}" Margin="0,0,2.5,0">
<Image Source="/Resources/SimulTab/PlayStep.png"
HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -35,14 +36,14 @@
</Button>
<Button Command="{Binding PlayPauseCommand}" Grid.Column="1" Grid.Row="3"
Style="{StaticResource OptionPanel_NestingButton}"
Style="{StaticResource Simul_Button_Img}"
ToolTip="{Binding PlayPauseToolTip}" Margin="2.5,0,2.5,0">
<Image Source="{Binding PlayPauseImage}" HorizontalAlignment="Center"
VerticalAlignment="Center" Height="50" Width="50"/>
</Button>
<Button Command="{Binding StopCommand}" Grid.Column="2" Grid.Row="3"
Style="{StaticResource OptionPanel_NestingButton}"
Style="{StaticResource Simul_Button_Img}"
ToolTip="{Binding StopHomeToolTip}" Margin="2.5,0,0,0">
<Image Source="/Resources/SimulTab/Stop.png"
HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -57,17 +58,18 @@
<Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="30"
Minimum="1" Maximum="100" TickPlacement="BottomRight" TickFrequency="10"
Margin="0,5,0,0" Value="{Binding SliderValue}"/>
<Grid Margin="0,0,0,5">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding TName}" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2"
Style="{StaticResource SimulTextBlock}"/>
@@ -80,10 +82,10 @@
<TextBlock Text="{Binding FValue}" Grid.Row="1" Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5"
Style="{StaticResource SimulTextBlock}"/>
</Grid>
<ItemsControl ItemsSource="{Binding MachineAxisList}" Margin="0,0,0,5">
</Grid>
<ItemsControl ItemsSource="{Binding MachineAxisList}" Margin="0,0,0,5">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="0,0,0,5">
@@ -99,7 +101,7 @@
<TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1"
IsReadOnly="{Binding IsReadOnlyAxesValue}"
IsEnabled="{Binding IsEnabledAxesValue}"
TextAlignment="Right">
Style="{StaticResource AxisTextBox}">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding ManualAxisModifyCommand}"/>
</TextBox.InputBindings>
@@ -110,11 +112,9 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</GroupBox>
</Border>
<GroupBox Header="{Binding EstimationMsg}" BorderThickness="0.5"
Foreground="White"
IsEnabled="{Binding Estimation_IsEnabled}"
<GroupBox Header="{Binding EstimationMsg}" Style="{StaticResource GroupBoxRow}"
DataContext="{Binding MyEstim}">
<StackPanel Margin="2,2,2,0">
@@ -123,8 +123,7 @@
<TextBlock Text="{Binding TimeMsg}"/>
<TextBox Text="{Binding Time, Mode=OneWay}"
IsReadOnly="True"
TextAlignment="Right"/>
Style="{StaticResource EstimateTextBox}"/>
</UniformGrid>
@@ -132,28 +131,25 @@
<TextBlock Text="{Binding CutLenMsg}"/>
<TextBox Text="{Binding CutLen, Mode=OneWay}"
IsReadOnly="True"
TextAlignment="Right"/>
Style="{StaticResource EstimateTextBox}"/>
</UniformGrid>
<UniformGrid Columns="2" Margin="0,0,0,5">
<TextBlock Text="{Binding NetAreaMsg}"/>
<TextBox Text="{Binding NetArea, Mode=OneWay}"
IsReadOnly="True"
TextAlignment="Right"/>
Style="{StaticResource EstimateTextBox}"/>
</UniformGrid>
<UniformGrid Columns="2" Margin="0,0,0,5">
<TextBlock Text="{Binding UsageMsg}"/>
<TextBox Text="{Binding Usage, Mode=OneWay}"
IsReadOnly="True"
TextAlignment="Right"/>
Style="{StaticResource EstimateTextBox}"/>
</UniformGrid>
<Button Content="{Binding DetailsMsg}" Height="30"
<Button Content="{Binding DetailsMsg}" Style="{StaticResource SimulPanel_TextButton}"
Command="{Binding Details_Command}"
Margin="0,0,0,2"/>
Project/ProjectV.xaml
+27 -24
View File
@@ -1,36 +1,39 @@
<EgtFloating:EgtFloatingManager x:Class="ProjectV"
<DockPanel x:Class="ProjectV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:OmagOFFICE="clr-namespace:OmagOFFICE">
xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
Background="{StaticResource Omag_DarkGray}">
<EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left" Background="{StaticResource Omag_DarkGray}">
<OmagOFFICE:OptionPanelV DataContext="{StaticResource OptionPanelVM}"
<DockPanel x:Name="LEFTTRAY" DockPanel.Dock="Left" Background="Transparent">
<OmagOFFICE:OptionPanelV DataContext="{StaticResource OptionPanelVM}"
Height="{Binding MaxHeight,ElementName=LEFTTRAY}"/>
</EgtFloating:EgtFloatingTray>
</DockPanel>
<EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top" Background="{StaticResource Omag_DarkGray}">
<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}"/>
</EgtFloating:EgtFloatingTray>
<DockPanel x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">
<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>
</DockPanel>
<EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="{StaticResource Omag_DarkGray}">
<EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"
Background="{StaticResource Omag_Gray}"
BorderBrush="{StaticResource Omag_Gray}"
<DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="{Binding}">
<EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"
Background="Transparent"
BorderBrush="Transparent"
RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
IsToolBar="False"
IsTopDockable="False" IsBottomDockable="True" IsLeftDockable="False"
IsTopDockable="False" IsBottomDockable="false" IsLeftDockable="False"
IsRightDockable="False"/>
</EgtFloating:EgtFloatingTray>
</StackPanel>
</DockPanel>
<OmagOFFICE:SceneHostV />
<!--Scena restituita sotto forma di WindowsFormsHost-->
<OmagOFFICE:SceneHostV/>
</EgtFloating:EgtFloatingManager>
</DockPanel>
Resources/NestingTab/AlignPieces.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Resources/NestingTab/ClockwiseRotate.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Resources/NestingTab/CounterClockwiseRotate.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Resources/NestingTab/DownArrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Resources/NestingTab/Draw.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 841 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Resources/NestingTab/ImportCsv.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Resources/NestingTab/ImportDxf.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Resources/NestingTab/LeftArrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 743 B

After

Width:  |  Height:  |  Size: 5.2 KiB

Resources/NestingTab/MaxMove.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Resources/NestingTab/PartRotOff.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Resources/NestingTab/PartRotOn.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Resources/NestingTab/RightArrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Resources/NestingTab/UpArrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Resources/NewIcons/DownArrow.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

Resources/NewIcons/LeftArrow.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

Resources/NewIcons/MaxMove.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.8 KiB

Resources/NewIcons/PartRotOff.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Resources/NewIcons/PartRotOn.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

Resources/NewIcons/Pause.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

Resources/NewIcons/Play.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

Resources/NewIcons/PlayStep.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

Resources/NewIcons/RightArrow.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.3 KiB

Resources/NewIcons/Stop.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

Resources/NewIcons/UpArrow.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

Resources/NewIcons/icone-tagli-3.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

Resources/NewIcons/ruota-oggetto-dx.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

Resources/NewIcons/ruota-oggetto-inclinato.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Resources/NewIcons/ruota-oggetto-sx.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

Resources/RawPartTab/MovePhoto.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

Resources/SimulTab/Pause.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Resources/SimulTab/Play.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Resources/SimulTab/PlayStep.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 3.8 KiB

Resources/SimulTab/Stop.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 3.7 KiB

SceneHost/SceneHostV.xaml
+4 -5
View File
@@ -1,11 +1,10 @@
<UserControl x:Class="SceneHostV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtUILib="clr-namespace:EgtUILib;assembly=EgtUILib"
Background="#484D55">
<WindowsFormsHost>
<EgtUILib:Scene x:Name="MainScene"/>
xmlns:EgtUILib="clr-namespace:EgtUILib;assembly=EgtUILib">
<WindowsFormsHost>
<EgtUILib:Scene x:Name="MainScene" BorderStyle="None"/>
</WindowsFormsHost>
</UserControl>
ShowPanel/ShowPanelV.xaml
+3 -5
View File
@@ -1,9 +1,7 @@
<EgtFloating:EgtFloatingPanel x:Class="ShowPanelV"
<DockPanel x:Class="ShowPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
@@ -21,4 +19,4 @@
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
</RadioButton>
</EgtFloating:EgtFloatingPanel>
</DockPanel>
TopCommandBar/TopCommandBarV.xaml
+17 -9
View File
@@ -1,19 +1,21 @@
<StackPanel x:Class="TopCommandBarV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Horizontal"
Orientation="Horizontal"
Height="32">
<!--Barra superiore dei comandi-->
<Button Command="{Binding NewCommand}"
<Button Command="{Binding NewCommand}"
ToolTip="{Binding NewToolTip}"
IsEnabled="{Binding IsEnabled}">
<Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}">
<Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding OpenCommand}"
ToolTip="{Binding OpenToolTip}"
IsEnabled="{Binding IsEnabled}"
ContextMenuService.Placement="Bottom"
Style = "{DynamicResource TopCmdBar_Button}"
Tag="{Binding}">
<Button.ContextMenu>
<ContextMenu ItemsSource="{Binding MruFileNames}">
@@ -32,33 +34,39 @@
</Button>
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
IsEnabled="{Binding IsEnabled}">
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}">
<Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding SaveAsCommand}"
ToolTip="{Binding SaveAsToolTip}"
IsEnabled="{Binding IsEnabled}">
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}">
<Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ExportCommand}"
ToolTip="{Binding ExportToolTip}"
IsEnabled="{Binding IsEnabled}">
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}">
<Image Source="/Resources/TopCommandBar/Export.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding DxfOutCommand}"
ToolTip="{Binding DxfOutToolTip}"
IsEnabled="{Binding IsEnabled}">
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}">
<Image Source="/Resources/TopCommandBar/DxfOut.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding OptionsCommand}"
ToolTip="{Binding OptionsToolTip}"
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}"
Width="{Binding RelativeSource={RelativeSource Self}, Path=ActualHeight}">
<Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
</Button>
<Button Command="{Binding SendFeedbackCommand}"
ToolTip="{Binding SendFeedbackToolTip}"
IsEnabled="{Binding IsEnabled}">
IsEnabled="{Binding IsEnabled}"
Style = "{DynamicResource TopCmdBar_Button}">
<Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
</Button>
Utility/OmagOFFICEDictionary.xaml
+441 -59
View File
@@ -1,6 +1,7 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
@@ -44,12 +45,48 @@
<SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
<SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
<SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
<SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
<SolidColorBrush x:Key="Omag_DarkGray" Color="#484D55" />
<SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
<SolidColorBrush x:Key="Omag_Black" Color="#1C1D22" />
<Thickness x:Key="BorderBtn_Thickness">0</Thickness>
<Thickness x:Key="BorderGpBx_Thickness">0.25</Thickness>
<Thickness x:Key="BorderBrd_Thickness">0.5</Thickness>
<SolidColorBrush x:Key="ForegroundTextBlock" Color="White" />
<!--Colori per EgtWPFLib5-->
<SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
<!-- ____________________________________ EGT TEXTBOX ____________________________________ -->
<!--Definizione colori per UserControl EgtTextBox-->
<!--Colore dello sfondo del border quando è attiva la TextBox-->
<SolidColorBrush x:Key="BackgroundBorderEnableFText" Color="#FF444444" />
<!--Colore dello sfondo del border quando non è attiva la TextBox-->
<SolidColorBrush x:Key="BackgroundBorderEnableTText" Color="#FF000000" />
<!--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.07"/>
</LinearGradientBrush>
<!--Colore del contorno quandodi default la TextBox-->
<LinearGradientBrush x:Key="BrushBorderIsMouseOverFText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
<GradientStop Color="#484D55" Offset="0.07"/>
<GradientStop Color="#1C1D22" Offset="1"/>
</LinearGradientBrush>
<!--Colore dello sfondo quando non è abilitata la TextBox-->
<SolidColorBrush x:Key="BackgroundTextBlockIsEnableFText" Color="#FF444444" />
<!--Colore dello sfondo quando è abilitata la TextBox-->
<SolidColorBrush x:Key="BackgroundTextBlockIsEnableTText" Color="#FF000000" />
<!--Colore della scritta quando non è selezioonata, ma è attiva la TextBox -->
<SolidColorBrush x:Key="ForegroundTextBlockIsEnableTText" Color="White" />
<!--Colore della scritta quando non è attiva la TextBox -->
<SolidColorBrush x:Key="ForegroundTextBlockIsEnableFText" Color="LightGray" />
<!--Colore della scritta quando seleziono la TextBox-->
<SolidColorBrush x:Key="ForegroundTextBoxText" Color="White" />
<!-- ____________________________________ EGT TEXTBOX ____________________________________ -->
<!--Colori per TabHeader-->
<LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#F0F0F0" Offset="0.0"/>
@@ -91,7 +128,7 @@
<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
<Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
@@ -99,26 +136,25 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="#FFF4F4F4"/>
<Setter Property="BorderBrush" Value="#FFADB2B5"/>
<Setter Property="TextElement.Foreground" Value="#FF838383"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
<Trigger Property="ToggleButton.IsChecked" Value="True">
<Setter Property="ToggleButton.BorderBrush" Value="{StaticResource Omag_Blue}" />
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#008BFF"/>
<Setter Property="BorderBrush" Value="#008BFF"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Gray}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#E1B957"/>
<Setter Property="BorderBrush" Value="#E1B957"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@@ -131,48 +167,171 @@
<TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
</DataTemplate>
<Style x:Key="TopCmdBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" Value="#008BFF"/>
<Setter Property="BorderBrush" Value="#008BFF"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="80"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
</Style>
<Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="45"/>
<Setter Property="Width" Value="45"/>
<Setter Property="Height" Value="40"/>
<Setter Property="Width" Value="40"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="OptionPanelRaw_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="50"/>
<Setter Property="Width" Value="50"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="MachiningTab_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="42"/>
<Setter Property="Width" Value="42"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="Split_Button_Img" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="45"/>
<Setter Property="Width" Value="45"/>
<Setter Property="Background" Value="Black"/>
<Setter Property="Height" Value="42"/>
<Setter Property="Width" Value="42"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="Nest_Button_Img" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="45"/>
<Setter Property="Width" Value="45"/>
<Setter Property="Background" Value="Black"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="Simul_Button_Img" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="50"/>
<Setter Property="Width" Value="50"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="SimulPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
<Setter Property="TextBlock.TextAlignment" Value="Center"/>
<Setter Property="Height" Value="45"/>
</Style>
<Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="50"/>
<Setter Property="Width" Value="50"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="DrawImport_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="50"/>
<Setter Property="Width" Value="50"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="OptionPanel_MoveButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="55"/>
<Setter Property="Width" Value="55"/>
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="40"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
</Style>
<Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
@@ -185,10 +344,11 @@
<Style TargetType="{x:Type ToggleButton}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
<Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
@@ -196,7 +356,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
@@ -204,21 +364,22 @@
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
<Setter Property="Background" Value="#008BFF"/>
<Setter Property="BorderBrush" Value="#008BFF"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
<Setter Property="Background" Value="#E1B957"/>
<Setter Property="BorderBrush" Value="#E1B957"/>
</Trigger>
<Trigger Property="IsChecked" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
<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="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
<!--<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>
@@ -228,6 +389,7 @@
</Style>
<Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
</Style>
@@ -239,18 +401,23 @@
<Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
</Style>
<Style x:Key="OptionPanelRaw_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"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
</Style>
<Style x:Key="Split_ToggleButton_Img" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="45"/>
<Setter Property="Width" Value="45"/>
<Setter Property="Background" Value="DarkGray"/>
<Setter Property="Height" Value="42"/>
<Setter Property="Width" Value="42"/>
</Style>
<Style x:Key="Nest_ToggleButton_Img" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="45"/>
<Setter Property="Width" Value="45"/>
<Setter Property="Background" Value="DarkGray"/>
</Style>
<Style x:Key="OptionPanel_ToggleWrapButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
@@ -262,6 +429,12 @@
<Setter Property="Width" Value="50"/>
</Style>
<Style x:Key="DrawImport_NestingToggleButton" 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="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="40"/>
</Style>
@@ -299,13 +472,13 @@
<!-- TextBlock -->
<Style x:Key="RawTextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="Margin" Value="10,0,0,0"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Margin" Value="0,0,0,0"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
</Style>
<Style x:Key="SimulTextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="Margin" Value="10,0,0,0"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
</Style>
<Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -331,6 +504,7 @@
<Style x:Key="OptionTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -360,6 +534,23 @@
<Setter Property="Margin" Value="0,0,5,0"/>
</Style>
<Style x:Key="EstimateTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
<Setter Property="Margin" Value="0,0,5,0"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="IsReadOnly" Value="true"/>
<Setter Property="TextAlignment" Value="Right"/>
</Style>
<Style x:Key="AxisTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
<Setter Property="Background" Value="#2D3036"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="IsReadOnly" Value="True"/>
<Setter Property="IsEnabled" Value="False"/>
<Setter Property="TextAlignment" Value="Right"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- MachGroup -->
@@ -378,7 +569,7 @@
<SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="#F0F0F0"/>
<Style x:Key="CustomScrollBarButton" TargetType="{x:Type RepeatButton}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
@@ -415,16 +606,23 @@
<!-- Border -->
<Style x:Key="DefaultBorder" TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#D5DFE5"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBrd_Thickness}"/>
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Padding" Value="3"/>
<Setter Property="Margin" Value="1"/>
</Style>
<Style x:Key="Border" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
<Setter Property="BorderThickness" Value="{StaticResource BorderBrd_Thickness}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Padding" Value="3"/>
</Style>
<Style x:Key="BorderSplit" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="{StaticResource BorderBrd_Thickness}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Padding" Value="3"/>
</Style>
@@ -435,8 +633,22 @@
<Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
<Setter Property="TitleBarHeight" Value="32"/>
<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
<!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
<Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
<Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
<Setter Property="TitleBarBrush" Value="{StaticResource BrushBorderIsMouseOverTText}" />
<Setter Property="BorderBrush" Value="Transparent" />
</Style>
<Style x:Key="MainWindowStyle" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
<Setter Property="TitleBarHeight" Value="32"/>
<!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
<Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
<Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
<Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />
<Setter Property="BorderBrush" Value="Transparent" />
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -583,6 +795,141 @@
<!-- ComboBox -->
<LinearGradientBrush x:Key="ButtonNormalBackground" EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#F3F3F3" Offset="0"/>
<GradientStop Color="#EBEBEB" Offset="0.5"/>
<GradientStop Color="#DDDDDD" Offset="0.5"/>
<GradientStop Color="#CDCDCD" Offset="1"/>
</LinearGradientBrush>
<SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
<LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
<GradientStop Color="#ABADB3" Offset="0.05"/>
<GradientStop Color="#E2E3EA" Offset="0.07"/>
<GradientStop Color="#E3E9EF" Offset="1"/>
</LinearGradientBrush>
<Style x:Key="ComboBoxFocusVisual">
<Setter Property="Control.Template">
<Setter.Value>
<ControlTemplate>
<Rectangle Margin="4,4,21,4" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
<Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="IsTabStop" Value="false"/>
<Setter Property="Focusable" Value="false"/>
<Setter Property="ClickMode" Value="Press"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}">
<Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
<Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="White" HorizontalAlignment="Center" Margin="3,1,0,0" VerticalAlignment="Center"/>
</Grid>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="IsTabStop" Value="false"/>
<Setter Property="Focusable" Value="false"/>
<Setter Property="ClickMode" Value="Press"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
<Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="White" HorizontalAlignment="Center" Margin="0,1,0,0" VerticalAlignment="Center"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</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="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="Padding" Value="4,3"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBox}">
<Grid x:Name="MainGrid" SnapsToDevicePixels="true">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
</Grid.ColumnDefinitions>
<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Width="{Binding ActualWidth, ElementName=MainGrid}" >
<Border x:Name="DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="{TemplateBinding BorderThickness}">
<ScrollViewer x:Name="DropDownScrollViewer">
<Grid RenderOptions.ClearTypeHint="Enabled">
<Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
<Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
</Canvas>
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Grid>
</ScrollViewer>
</Border>
</Popup>
<ToggleButton Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxReadonlyToggleButton}"/>
<ContentPresenter ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="HasItems" Value="false">
<Setter Property="Height" TargetName="DropDownBorder" Value="95"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
<Setter Property="Background" Value="#FFF4F4F4"/>
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsGrouping" Value="true"/>
</MultiTrigger.Conditions>
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</MultiTrigger>
<Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
<Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="Raw_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<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="30" />
<Setter Property="Width" Value="Auto" />
</Style>
<Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="Margin" Value="0,0,0,10"/>
</Style>
@@ -610,24 +957,31 @@
</Style>
<Style x:Key="TabItemOptinPanel" TargetType="{x:Type TabItem}" >
<Setter Property="Width" Value="35"/>
<Setter Property="Height" Value="35"/>
<Setter Property="Width" Value="44"/>
<Setter Property="Height" Value="44"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TabItem}">
<Grid>
<Border Name="border" Margin="0,0,2,2" BorderThickness="1" CornerRadius="3" BorderBrush="{StaticResource Omag_Gray}">
<Border Name="border" Margin="1,0,0,0" BorderThickness="0" CornerRadius="0"
Background="{StaticResource Omag_DarkGray}"
BorderBrush="{StaticResource Omag_Gray}">
<ContentPresenter x:Name="contentPresenter" VerticalAlignment="Center" HorizontalAlignment="Center"
ContentSource="Header" RecognizesAccessKey="True"/>
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" TargetName="border" Value="#FFF4F4F4"/>
<Setter Property="BorderBrush" TargetName="border" Value="#FFADB2B5"/>
</Trigger>
<Trigger Property="IsSelected" Value="false">
<Setter Property="Background" TargetName="border" Value="#F0F0F0"/>
<Trigger Property="IsEnabled" Value="True">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Black}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Omag_Black}"/>
</Trigger>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Blue}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Omag_Gray}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@@ -635,4 +989,32 @@
</Setter>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- ImageButton -->
<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="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- GroupBox -->
<Style x:Key="GroupBoxSplit" TargetType="{x:Type GroupBox}">
<Setter Property="BorderThickness" Value="{StaticResource BorderGpBx_Thickness}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Margin" Value="0,0,0,0"/>
</Style>
<Style x:Key="GroupBoxRow" TargetType="{x:Type GroupBox}">
<Setter Property="BorderThickness" Value="{StaticResource BorderGpBx_Thickness}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Margin" Value="0,0,0,0"/>
</Style>
</ResourceDictionary>
VeinMatchPanel/VeinMatchPanelV.xaml
+3 -5
View File
@@ -1,9 +1,7 @@
<EgtFloating:EgtFloatingPanel x:Class="VeinMatchPanelV"
<DockPanel x:Class="VeinMatchPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
<ToggleButton ToolTip="{Binding VeinMatchMsg}"
Style="{StaticResource ToolBar_ToggleButton}"
@@ -12,4 +10,4 @@
<Image Source="/Resources/NewIcons/Vein-match.png" Stretch="Uniform" />
</ToggleButton>
</EgtFloating:EgtFloatingPanel>
</DockPanel>
ViewPanel/ViewPanelV.xaml
+3 -5
View File
@@ -1,9 +1,7 @@
<EgtFloating:EgtFloatingPanel x:Class="ViewPanelV"
<DockPanel x:Class="ViewPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
<Button ToolTip="{Binding ZoomAllToolTip}"
Style="{StaticResource ToolBar_Button}"
@@ -41,4 +39,4 @@
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
</DockPanel>