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

Optimizer 2.7.11.6

Browse Source 
-sistemato dizionario e grafica
This commit is contained in:
Demetrio Cassarino
2025-11-14 14:56:40 +01:00
parent 59693349f3
commit 059b45043d
79 changed files with 2964 additions and 1860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml
+5 -5
View File
@@ -133,27 +133,27 @@
Command="{Binding MoveRowUp_Command}"
Grid.Column="0"
Margin="0,0,2.5,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="\/"
Command="{Binding MoveRowDown_Command}"
Grid.Column="1"
Margin="2.5,0,2.5,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="{Binding AddRowMsg}"
Command="{Binding AddRow_Command}"
Grid.Column="2"
Margin="2.5,0,2.5,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="{Binding DeleteRowMsg}"
Command="{Binding DeleteRow_Command}"
Grid.Column="3"
Margin="2.5,0,2.5,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="{Binding SaveMsg}"
Command="{Binding Save_Command}"
Grid.Column="4"
Margin="2.5,0,0,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
+3 -3
View File
@@ -94,7 +94,7 @@
Command="{Binding ChooseExternalBackupFolderPath_Command}"
IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
Margin="2.5,0,0,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
@@ -111,11 +111,11 @@
Orientation="Horizontal">
<Button Content="Backup"
Command="{Binding Backup_Command}"
Style="{StaticResource EgtWPFLib5_InputButton}"
Style="{StaticResource EgtWPFLib5_Button}"
Margin="0,0,5,0"/>
<Button Content="Restore"
Command="{Binding Restore_Command}"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</StackPanel>
</Grid>
</GroupBox>
EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
+3 -3
View File
@@ -14,7 +14,7 @@
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
<GroupBox Style="{StaticResource NoHeader_GroupBox}" Padding="5,10,5,5">
<EgtBEAMWALLCORE:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
</GroupBox>
</StackPanel>
@@ -47,7 +47,7 @@
ToolTip="{Binding sName}"
TextWrapping="WrapWithOverflow"
Width="150"
Style="{StaticResource MachParamTextBlock}"/>
Style="{StaticResource MachParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
Width="60"/>
@@ -56,7 +56,7 @@
ToolTip="{Binding sDescription}"
TextWrapping="WrapWithOverflow"
Width="148"
Style="{StaticResource MachParamTextBlock}"/>
Style="{StaticResource MachParam_TextBlock}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml
+2 -2
View File
@@ -258,11 +258,11 @@
Content="OK"
Command="{Binding Ok_Command}"
Margin="2.5,0,2.5,0"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
<Button Content="Cancel"
Command="{Binding Cancel_Command}"
Margin="2.5,0,2.5,0"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
</UniformGrid>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
+2 -2
View File
@@ -405,12 +405,12 @@
Command="{Binding Ok_Command}"
HorizontalAlignment="Right"
Margin="15,0,2.5,0"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
<Button Content="Cancel"
Command="{Binding Cancel_Command}"
HorizontalAlignment="Left"
Margin="2.5,0,0,0"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
</UniformGrid>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml
+1 -1
View File
@@ -40,7 +40,7 @@
Content="{Binding sMessage}"
Command="{Binding Command_Command}"
Margin="2.5,0,2.5,0"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml
+6 -6
View File
@@ -38,15 +38,15 @@
<Button Content="{Binding NewMsg}" Command="{Binding NewCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}" Height="30"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
<Button Content="{Binding SaveMsg}" Command="{Binding SaveCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}" Height="30"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
<Button Content="{Binding RemoveMsg}" Command="{Binding RemoveCommand}"
CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}" Height="30"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
</UniformGrid>
<TreeView Name="MachiningsTreeView" Grid.Row="1"
@@ -111,12 +111,12 @@
<UniformGrid Grid.Row="2" Columns="3">
<Button Content="{Binding ImportMsg}" Command="{Binding ImportCommand}" Height="30"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
<Button Content="{Binding ExportMsg}" Command="{Binding ExportCommand}" Height="30"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
<Button Content="{Binding ResetMsg}" Command="{Binding ReloadMachiningCommand}"
CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}" Height="30"
Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
Style="{StaticResource RightPanel_HalfRound_Button}"/>
</UniformGrid>
</Grid>
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -38,5 +38,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.11.3")>
<Assembly: AssemblyFileVersion("2.7.11.3")>
<Assembly: AssemblyVersion("2.7.11.6")>
<Assembly: AssemblyFileVersion("2.7.11.6")>
EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+5 -5
View File
@@ -83,7 +83,7 @@
<StackPanel Grid.Column="2"
Orientation="Horizontal">
<TextBlock Text="{Binding Rows_Msg}"
Style="{StaticResource OptionTextBlock}"
Style="{StaticResource Option_TextBlock}"
Foreground="{StaticResource BeamWall_Corduroy}"/>
<ComboBox ItemsSource="{Binding RowQuantityList}"
SelectedIndex="{Binding SelRowQuantity}"
@@ -228,18 +228,18 @@
Margin="0,0,0,5">
<Button IsDefault="True" Name="OpenBtn"
Content="{Binding Open_Msg}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
<Button Content="{Binding Archive_Msg}"
Command="{Binding Archive_Command}"
IsEnabled="{Binding bArchived_IsEnabled}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
<Button Content="{Binding Delete_Msg}"
Command="{Binding Delete_Command}"
IsEnabled="{Binding bDelete_IsEnabled}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
<Button Command="{Binding Cancel_Command}"
Content="{Binding Cancel_Msg}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
+4 -4
View File
@@ -81,7 +81,7 @@
<StackPanel Grid.Column="2"
Orientation="Horizontal">
<TextBlock Text="Rows"
Style="{StaticResource OptionTextBlock}"
Style="{StaticResource Option_TextBlock}"
Foreground="{StaticResource BeamWall_Corduroy}"/>
<ComboBox ItemsSource="{Binding RowQuantityList}"
SelectedIndex="{Binding SelRowQuantity}"
@@ -184,13 +184,13 @@
<UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
<Button IsDefault="True" Name="OpenBtn"
Content="{Binding Open_Msg}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
<Button Content="{Binding Delete_Msg}"
Command="{Binding Delete_Command}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
<Button IsCancel="True"
Content="{Binding Cancel_Msg}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
Style="{DynamicResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
EgtBEAMWALL.Core/Themes/Generic.xaml
+279 -52
View File
@@ -6,19 +6,17 @@
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
<EgwWPFBaseLib:CaptionHeightConverter x:Key="CaptionHeightConverter"/>
<EgtWPFLib5:HexClipConverter x:Key="ClipConverter"/>
<!--#region Colori Predefiniti-->
<SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
<SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
<SolidColorBrush x:Key="Omag_Red" Color="Red" />
<SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
<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_White" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
<!--#FFFFFF-->
<Color x:Key="BeamWall_White_Color" R="255" G="255" B="255" A="255"/>
<SolidColorBrush x:Key="BeamWall_White" Color="{StaticResource BeamWall_White_Color}" />
<!--#F2F2F2-->
<Color x:Key="BeamWall_Concrete_Color" R="242" G="242" B="242" A="255"/>
<SolidColorBrush x:Key="BeamWall_Concrete" Color="{StaticResource BeamWall_Concrete_Color}" />
<!--#00008B-->
<Color x:Key="BeamWall_DarkBlue_Color" R="0" G="0" B="139" A="255"/>
@@ -32,22 +30,50 @@
<Color x:Key="BeamWall_Aqua_Color" R="0" G="255" B="255" A="255"/>
<SolidColorBrush x:Key="BeamWall_Aqua" Color="{StaticResource BeamWall_Aqua_Color}" />
<!--#095CA8-->
<Color x:Key="BeamWall_Blue_Color" R="9" G="92" B="168" A="255"/>
<SolidColorBrush x:Key="BeamWall_Blue" Color="{StaticResource BeamWall_Blue_Color}" />
<!--#838383-->
<Color x:Key="BeamWall_Gray_Color" R="131" G="131" B="131" A="255"/>
<SolidColorBrush x:Key="BeamWall_Gray" Color="{StaticResource BeamWall_Gray_Color}" />
<!--#000000-->
<Color x:Key="BeamWall_Black_Color" R="0" G="0" B="0" A="255"/>
<SolidColorBrush x:Key="BeamWall_Black" Color="{StaticResource BeamWall_Black_Color}" />
<!--#FFD700-->
<Color x:Key="BeamWall_Gold_Color" R="255" G="215" B="0" A="255"/>
<SolidColorBrush x:Key="BeamWall_Gold" Color="{StaticResource BeamWall_Gold_Color}" />
<!--#FFCE5B-->
<Color x:Key="BeamWall_GoldenTainoi_Color" R="255" G="206" B="91" A="255"/>
<SolidColorBrush x:Key="BeamWall_GoldenTainoi" Color="{StaticResource BeamWall_GoldenTainoi_Color}" />
<!--#FF0000-->
<Color x:Key="BeamWall_Red_Color" R="255" G="0" B="0" A="255"/>
<SolidColorBrush x:Key="BeamWall_Red" Color="{StaticResource BeamWall_Red_Color}" />
<!--#7CFC00-->
<Color x:Key="BeamWall_Chartreuse_Color" R="124" G="252" B="0" A="255"/>
<SolidColorBrush x:Key="BeamWall_Chartreuse" Color="{StaticResource BeamWall_Chartreuse_Color}" />
<!--#D9D9D9-->
<Color x:Key="BeamWall_Alto_Color" R="217" G="217" B="217" A="255"/>
<SolidColorBrush x:Key="BeamWall_Alto" Color="{StaticResource BeamWall_Alto_Color}" />
<!--#4D84C4-->
<Color x:Key="BeamWall_Indigo_Color" R="77" G="132" B="196" A="255"/>
<SolidColorBrush x:Key="BeamWall_Indigo" Color="{StaticResource BeamWall_Indigo_Color}" />
<!--#endregion Colori Predefiniti-->
<!--#region Colori Nuova Grafica-->
<!--#FFFFFF-->
<Color x:Key="BeamWall_White_Color" R="255" G="255" B="255" A="255"/>
<SolidColorBrush x:Key="BeamWall_White" Color="{StaticResource BeamWall_White_Color}" />
<!--#E6E6E6-->
<Color x:Key="BeamWall_Mercury_Color" R="230" G="230" B="230" A="255"/>
<SolidColorBrush x:Key="BeamWall_Mercury" Color="{StaticResource BeamWall_Mercury_Color}" />
<!--#F2F2F2-->
<Color x:Key="BeamWall_Concrete_Color" R="242" G="242" B="242" A="255"/>
<SolidColorBrush x:Key="BeamWall_Concrete" Color="{StaticResource BeamWall_Concrete_Color}" />
<!--#F3F7FB-->
<Color x:Key="BeamWall_BLackSqueeze_Color" R="243" G="247" B="251" A="255"/>
<SolidColorBrush x:Key="BeamWall_BLackSqueeze" Color="{StaticResource BeamWall_BLackSqueeze_Color}" />
@@ -152,10 +178,6 @@
<Color x:Key="BeamWall_Silver_Color" R="191" G="191" B="191" A="255"/>
<SolidColorBrush x:Key="BeamWall_Silver" Color="{StaticResource BeamWall_Silver_Color}" />
<!--#D9D9D9-->
<Color x:Key="BeamWall_Alto_Color" R="217" G="217" B="217" A="255"/>
<SolidColorBrush x:Key="BeamWall_Alto" Color="{StaticResource BeamWall_Alto_Color}" />
<!--#707070-->
<Color x:Key="BeamWall_DoveGray_Color" R="112" G="112" B="112" A="255"/>
<SolidColorBrush x:Key="BeamWall_DoveGray" Color="{StaticResource BeamWall_DoveGray_Color}" />
@@ -172,10 +194,6 @@
<Color x:Key="BeamWall_Calypso_Color" R="44" G="98" B="139" A="255"/>
<SolidColorBrush x:Key="BeamWall_Calypso" Color="{StaticResource BeamWall_Calypso_Color}" />
<!--#838383-->
<Color x:Key="BeamWall_Gray_Color" R="131" G="131" B="131" A="255"/>
<SolidColorBrush x:Key="BeamWall_Gray" Color="{StaticResource BeamWall_Gray_Color}" />
<!--#F3F9FF-->
<Color x:Key="BeamWall_AliceBlue_Color" R="243" G="249" B="255" A="255"/>
<SolidColorBrush x:Key="BeamWall_AliceBlue" Color="{StaticResource BeamWall_AliceBlue_Color}" />
@@ -188,6 +206,16 @@
<Color x:Key="BeamWall_Gallery_Color" R="240" G="240" B="240" A="255"/>
<SolidColorBrush x:Key="BeamWall_Gallery" Color="{StaticResource BeamWall_Gallery_Color}" />
<!--#D5DFE5-->
<Color x:Key="BeamWall_Geyser_Color" R="213" G="223" B="229" A="255"/>
<SolidColorBrush x:Key="BeamWall_Geyser" Color="{StaticResource BeamWall_Geyser_Color}" />
<LinearGradientBrush x:Key="Optimizer.Background" EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
</LinearGradientBrush>
<!--#endregion Colori Nuova Grafica-->
<!--#region Colori per EgtWPFLib5-->
@@ -197,7 +225,7 @@
<!--#endregion Colori per EgtWPFLib5-->
<!--#region Colori Button-->
<SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
<SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="{StaticResource BeamWall_DoveGray_Color}"/>
<SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="{StaticResource BeamWall_FrenchPass_Color}"/>
@@ -220,16 +248,7 @@
<SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{StaticResource BeamWall_White_Color}" Opacity="0.5"/>
<!--#endregion Colori Button-->
<!--#region Colori DataGrid-->
<LinearGradientBrush x:Key="DataGrid.Static.Background" EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="0.0"/>
<GradientStop Color="{StaticResource BeamWall_AthensGray_Color}" Offset="1.0"/>
</LinearGradientBrush>
<!--#endregion Colori DataGrid-->
<!--#region Colori ScrollBar-->
<SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
@@ -250,7 +269,7 @@
<SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
<!--#endregion Colori ScrollBar-->
<!--#region Colori ComboBox-->
<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
@@ -290,7 +309,7 @@
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
<!--#endregion Colori ComboBox-->
<!--#region Colori Expander-->
<SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
@@ -307,7 +326,7 @@
<SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
<!--#endregion Colori Expander-->
<!--#region Colori ListBox-->
<SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
@@ -320,7 +339,7 @@
<SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
<!--#endregion Colori ListBox-->
<!--#region Colori TabItem-->
<LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
@@ -341,7 +360,27 @@
<SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
<!--#endregion Colori TabItem-->
<!--#region Colori ScrollViewer-->
<LinearGradientBrush x:Key="ScrollViewer.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Silver_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Alto_Color}" Offset="0.45"/>
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1"/>
</LinearGradientBrush>
<!--#endregion Colori ScrollViewer-->
<!--#region Colori Grid-->
<LinearGradientBrush x:Key="Grid.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
</LinearGradientBrush>
<!--#endregion Colori Grid-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region FocusVisual standard-->
@@ -361,7 +400,7 @@
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region Button-->
<Style TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
@@ -403,6 +442,20 @@
</Setter>
</Style>
<Style x:Key="RightPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="Height" Value="24"/>
<Setter Property="Width" Value="64"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="HorizontalAlignment" Value="Right"/>
<Setter Property="Margin" Value="2.5,0,5,0"/>
</Style>
<Style x:Key="LeftPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
</Style>
<Style x:Key="OnlyProd_Button" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
@@ -492,7 +545,7 @@
<Setter Property="Margin" Value="5,0,0,0"/>
</Style>
<Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
<Style x:Key="EgtWPFLib5_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="80"/>
</Style>
@@ -513,20 +566,26 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style x:Key="RightPanel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
<Setter Property="Height" Value="24"/>
<Setter Property="Width" Value="64"/>
<Setter Property="BorderThickness" Value="1,1,1,0"/>
</Style>
<!--#endregion Button-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region TextBlock-->
<Style x:Key="OptionTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Style x:Key="Option_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="10,5,10,0"/>
</Style>
<Style x:Key="MachParamTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Style x:Key="MachParam_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Center"/>
@@ -544,9 +603,10 @@
<Setter Property="Margin" Value="0,0,20,0"/>
</Style>
<Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontSize" Value="13"/>
</Style>
<!--#endregion TextBlock-->
@@ -560,8 +620,25 @@
<Setter Property="TextWrapping" Value="Wrap"/>
</Style>
<Style x:Key="ParameterList_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Right"/>
<Setter Property="Height" Value="22"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="12"/>
</Style>
<Style x:Key="ColorPicker_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="Width" Value="65"/>
</Style>
<!--#endregion TextBox-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region EgtWindow-->
@@ -586,7 +663,7 @@
<ControlTemplate x:Key="OptimizerWindow.ControlTemplate.WithTitleBar" TargetType="{x:Type EgwWPFBaseLib:EgtWindow}">
<Border BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="{StaticResource Omag_LightGray}"
BorderBrush="{StaticResource BeamWall_Alto}"
Background="{TemplateBinding Background}">
<Grid>
<Grid.RowDefinitions>
@@ -777,7 +854,7 @@
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsChecked" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/>
<Setter Property="Background" TargetName="border" Value="{StaticResource BeamWall_GoldenTainoi}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
@@ -798,6 +875,11 @@
<Setter Property="Margin" Value="5,0,0,0"/>
</Style>
<Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
</Style>
<!--#endregion ToggleButton Style-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1077,6 +1159,13 @@
<Setter Property="Width" Value="150"/>
</Style>
<Style x:Key="RightPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Height" Value="25"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Width" Value="200"/>
</Style>
<!--#endregion ComboBox-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1611,9 +1700,9 @@
<!--#region Border-->
<Style x:Key="Optimizer_Border" TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
<Setter Property="CornerRadius" Value="4"/>
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
</Style>
<!--#endregion Border-->
@@ -1697,6 +1786,10 @@
</Style.Triggers>
</Style>
<Style x:Key="Button_Image" TargetType="{x:Type Image}">
<Setter Property="Stretch" Value="Uniform" />
</Style>
<!--#endregion Image-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1729,4 +1822,138 @@
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region EgtHexagon-->
<Style x:Key="EgtHexItem" TargetType="{x:Type EgtWPFLib5:EgtHexItem}">
<Setter Property="Background" Value="{StaticResource BeamWall_CornflowerBlue}"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Black}"/>
<Setter Property="BorderThickness" Value="1.5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="EgtWPFLib5:EgtHexItem">
<Grid Name="hexBorder" Background="{TemplateBinding BorderBrush}">
<Grid.Clip>
<MultiBinding Converter="{StaticResource ClipConverter}">
<Binding Path="ActualWidth" ElementName="hexBorder"/>
<Binding Path="ActualHeight" ElementName="hexBorder"/>
<Binding Path="Orientation" RelativeSource="{RelativeSource TemplatedParent}"/>
</MultiBinding>
</Grid.Clip>
<Grid Name="hexContent"
Background="{TemplateBinding Background}"
Margin="{TemplateBinding BorderThickness}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
<Grid.Clip>
<MultiBinding Converter="{StaticResource ClipConverter}">
<Binding Path="ActualWidth" ElementName="hexContent"/>
<Binding Path="ActualHeight" ElementName="hexContent"/>
<Binding Path="Orientation" RelativeSource="{RelativeSource TemplatedParent}"/>
</MultiBinding>
</Grid.Clip>
<ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
ClipToBounds="True"
Margin="{TemplateBinding Padding}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"/>
</Grid>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gold}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!--HexList-->
<Style x:Key="EgtHexList" TargetType="{x:Type EgtWPFLib5:EgtHexList}">
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<EgtWPFLib5:EgtHexagon ColumnCount="{Binding Path=ColumnCount, RelativeSource={RelativeSource AncestorType=ListBox}}"
RowCount="{Binding Path=RowCount, RelativeSource={RelativeSource AncestorType=ListBox}}"
Background="{Binding Path=Background, RelativeSource={RelativeSource AncestorType=ListBox}}"/>
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtHexList}">
<Grid>
<Border BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
<ScrollViewer Focusable="False"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto"
Padding="{TemplateBinding Padding}">
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</ScrollViewer>
</Border>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!--#endregion EgtHexagon-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!--#region GroupBox-->
<Style x:Key="NoHeader_GroupBox" TargetType="{x:Type GroupBox}">
<Setter Property="Margin" Value="1.5,3,3,0"/>
<Setter Property="Padding" Value="5,5,0,0"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Geyser}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupBox}">
<Grid SnapsToDevicePixels="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="6"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="6"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="6"/>
</Grid.RowDefinitions>
<Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
<Border BorderBrush="{StaticResource BeamWall_White}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
<Border BorderBrush="{StaticResource BeamWall_White}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
</Border>
</Border>
<Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
<ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Border>
<ContentPresenter Grid.ColumnSpan="2" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="General_GroupBox" TargetType="{x:Type GroupBox}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
</Style>
<!--#endregion GroupBox-->
<!-- ______________________________________________________________________________________________________________________________________________ -->
</ResourceDictionary>
EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml
+17 -24
View File
@@ -19,14 +19,12 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Border Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2" CornerRadius="4,0,0,4">
<Border Style="{StaticResource AddFeatureWnd_Border}">
<TextBlock Text="{Binding Process_Msg}"
Style="{StaticResource ListTextBlock}"/>
Style="{StaticResource List_TextBlock}"/>
</Border>
<Border Grid.Row="1"
Style="{StaticResource Optimizer_Border}"
CornerRadius="4,0,0,4"
BorderThickness="2,2,0,2">
Style="{StaticResource PRCList_Border}">
<ListBox Grid.Row="1"
ItemsSource="{Binding PRCListView}"
SelectedItem="{Binding nSelPRC}"
@@ -36,23 +34,21 @@
<DataTemplate>
<TextBlock Text="{Binding ghDesc}"
ToolTip="{Binding ghDesc}"
TextAlignment="Justify"
Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource PRCList_TextBlock}"/>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Border>
<Border Grid.Column="1" Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2">
<Border Grid.Column="1"
Style="{StaticResource Custom_Border}">
<TextBlock Grid.Column="1"
Text="{Binding Custom_Msg}"
Style="{StaticResource ListTextBlock}"/>
Text="{Binding Custom_Msg}"
Style="{StaticResource List_TextBlock}"/>
</Border>
<Border Grid.Row="1"
Grid.Column="1"
Style="{StaticResource Optimizer_Border}"
CornerRadius="0"
BorderThickness="0,2,0,2">
Style="{StaticResource MacroCustomList_Border}">
<ListBox ItemsSource="{Binding MacroCustomList}"
SelectedIndex="{Binding nSelMacroCustom}"
Style="{StaticResource MacroCustom_ListBox}">
@@ -78,16 +74,14 @@
</ListBox.ItemTemplate>
</ListBox>
</Border>
<Border Grid.Column="2" Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2" Padding="0,10,0,10" CornerRadius="0,4,4,0">
<TextBlock
Text="{Binding Default_Msg}"
Style="{StaticResource ListTextBlock}"/>
<Border Grid.Column="2"
Style="{StaticResource Default_Border}">
<TextBlock Text="{Binding Default_Msg}"
Style="{StaticResource List_TextBlock}"/>
</Border>
<Border Grid.Row="1"
Grid.Column="2"
Style="{StaticResource Optimizer_Border}"
CornerRadius="0,4,4,0"
BorderThickness="0,2,2,2">
Style="{StaticResource MacroDefaultList_Border}">
<ListBox ItemsSource="{Binding MacroDefaultList}"
SelectedIndex="{Binding nSelMacroDefault}"
Style="{StaticResource MacroDefault_ListBox}"
@@ -95,7 +89,6 @@
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding sMacroName}"
TextAlignment="Justify"
Style="{StaticResource MacroDefault_TextBlock}"/>
</DataTemplate>
</ListBox.ItemTemplate>
@@ -104,14 +97,14 @@
<UniformGrid Columns="2"
Grid.Row="2"
Grid.ColumnSpan="3"
Margin="5">
Style="{StaticResource AddFeatureWnd_UniformGrid}">
<Button Content="{Binding OK_Msg}"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="{Binding Cancel_Msg}"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml
+11 -11
View File
@@ -22,13 +22,13 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Name"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sNAM}"
Style="{StaticResource NAM_TextBox}"/>
</Grid>
<Grid Grid.Row="1"
Margin="0,0,0,5">
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -36,19 +36,19 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Prod Number"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding nPDN}"
Style="{StaticResource Dimension_TextBox}"/>
<TextBlock Grid.Column="2"
Text="Count"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="3"
Text="{Binding sCNT}"
Style="{StaticResource Dimension_TextBox}"/>
</Grid>
<Grid Grid.Row="2"
Margin="0,0,0,5">
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -58,19 +58,19 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="W"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sW}"
Style="{StaticResource Dimension_TextBox}"/>
<TextBlock Grid.Column="2"
Text="H"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="3"
Text="{Binding sH}"
Style="{StaticResource Dimension_TextBox}"/>
<TextBlock Grid.Column="4"
Text="L"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="5"
Text="{Binding sL}"
Style="{StaticResource Dimension_TextBox}"/>
@@ -78,14 +78,14 @@
<UniformGrid Grid.Row="3"
Columns="2"
Margin="0,5,0,5">
Style="{StaticResource AddPartWnd_UniformGrid}">
<Button Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml
+8 -9
View File
@@ -8,7 +8,8 @@
WindowStyle="None"
Title="AddRawPartWnd"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -18,20 +19,18 @@
SelectedItem="{Binding SelDimension}"
DisplayMemberPath="sDimension"
Visibility="{Binding DimensionsList_Visibility}"
Margin="0,0,0,5"
Style="{StaticResource OnlyProd_ComboBox}"/>
Style="{StaticResource AddRawPartWnd_ComboBox}"/>
<ItemsControl Grid.Row="1"
ItemsSource="{Binding VariableList}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="0,0,0,5">
<Grid Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sMsg}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sValue}"
Style="{StaticResource Value_TextBox}"/>
@@ -41,17 +40,17 @@
</ItemsControl>
<UniformGrid Grid.Row="2"
Columns="2"
Margin="0,0,0,5">
Style="{StaticResource AddRawPartWnd_UniformGrid}">
<Button Grid.Column="1"
Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_InputButton}"
Style="{StaticResource AddRawPartWnd_Button}"
Margin="0,0,5,0"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml
+17 -15
View File
@@ -8,9 +8,10 @@
WindowStyle="None"
Title="AddSectionXMaterial"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<StackPanel Margin="5,5,5,0">
<StackPanel Style="{StaticResource AddSectionXMaterialWnd_StackPanel}">
<EgtBEAMWALLCORE:EgtDataGrid Grid.Row="0" Width="500" MaxHeight="600"
<EgtBEAMWALLCORE:EgtDataGrid Width="500" MaxHeight="600"
ItemsSource="{Binding NewSectionXMaterialList}"
SelectedItem="{Binding SelNewSectionXMaterial}"
CanUserAddRows="False"
@@ -40,7 +41,7 @@
<DataTemplate>
<CheckBox IsChecked="{Binding Path=Alias_IsChecked, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding Alias_IsEnabled}"
HorizontalAlignment="Center"/>
Style="{StaticResource Alias_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -52,7 +53,7 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.CellStyle>
<Style TargetType="DataGridCell">
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
</Style>
</DataGridTextColumn.CellStyle>
@@ -65,7 +66,7 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.CellStyle>
<Style TargetType="DataGridCell">
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
</Style>
</DataGridTextColumn.CellStyle>
@@ -91,7 +92,7 @@
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.CellStyle>
<Style TargetType="DataGridCell">
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
</Style>
</DataGridTextColumn.CellStyle>
@@ -99,7 +100,8 @@
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
<Grid Grid.Row="2" Margin="0,0,0,5">
<Grid Grid.Row="2"
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -107,16 +109,16 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding Ok_Msg}"
<Button Grid.Column="1"
Content="{Binding Ok_Msg}"
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="{Binding Cancel_Msg}"
Command="{Binding Cancel_Command}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
IsCancel="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</StackPanel>
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
+14 -12
View File
@@ -18,9 +18,9 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<ComboBox ItemsSource="{Binding StrategySetupList}" HorizontalAlignment="Center" Margin="0,10,0,10"
<ComboBox ItemsSource="{Binding StrategySetupList}"
SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource Strategy_ComboBox}" />
Style="{StaticResource BTLDataWnd_ComboBox}"/>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -29,27 +29,29 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<OPTIMIZER:ProjectParametersV Grid.RowSpan="2" Margin="0,10,0,0"
<OPTIMIZER:ProjectParametersV Grid.RowSpan="2"
Margin="0,10,0,0"
Tag="{Binding GeneralParametersList}"
IsEnabled="{Binding GeneralParametersIsEnable}"/>
<UniformGrid Rows="2" Grid.Column="1" Margin="0,0,5,0">
<UniformGrid Grid.Column="1"
Rows="2"
Style="{StaticResource BTLDataWnd_UniformGrid}">
<CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
Margin="10,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
<Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="0,0,0,5"
Style="{StaticResource BTLDataWnd_CheckBox}"/>
<Button Command="{Binding Ok_Command}"
ToolTip="{Binding SaveAsToolTip}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
Style="{StaticResource BTLDataWnd_Button}">
<Image Source="/Resources/NewPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</UniformGrid>
</Grid>
</Grid>
</TabItem>
<TabItem Header="BTL">
<UniformGrid Margin="5"
Columns="6" Rows="7">
Columns="6"
Rows="7">
<TextBlock Text="{Binding PROJNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
+11 -9
View File
@@ -2,10 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
DataContext="{StaticResource BTLPartManagerVM}"
CornerRadius="5"
BorderThickness="2"
BorderBrush="{StaticResource BeamWall_Teal}"
Background="{StaticResource BeamWall_FountainBlue}">
Style="{StaticResource BTLPartManager_Border}">
<StackPanel Orientation="Horizontal"
Style="{StaticResource BTLPartManager_StackPanel}">
@@ -14,35 +11,40 @@
ToolTip="{Binding CopyPart_ToolTip}"
IsEnabled="{Binding CopyPart_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
<Image Source="/Resources/LeftPanel/CopyPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding RemovePart_Command}"
Click="ClosePopUp_Click"
ToolTip="{Binding RemovePart_ToolTip}"
IsEnabled="{Binding RemovePart_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Remove.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding Simulate_ToolTip}"
Click="ClosePopUp_Click"
Command="{Binding Simulate_Command}"
IsEnabled="{Binding Simulate_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Simulate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding Edit_ToolTip}"
Click="ClosePopUp_Click"
Command="{Binding Edit_Command}"
IsEnabled="{Binding Edit_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Edit.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ResetCalc_Command}"
Click="ClosePopUp_Click"
ToolTip="{Binding ResetCalc_ToolTip}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/ResetCalc.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml
+10 -11
View File
@@ -8,8 +8,7 @@
Height="200" Width="400"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
@@ -21,9 +20,8 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="1"
Text="{Binding Msg_Text}"
TextAlignment="Center"
Margin="40,0,40,0"/>
<Grid Grid.Row="5">
Style="{StaticResource Msg_TextBlock}"/>
<Grid Style="{StaticResource BlockedWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -31,17 +29,18 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="1" Content="{Binding Save_Msg}"
<Button Grid.Column="1"
Content="{Binding Save_Msg}"
IsDefault="True"
Command="{Binding Save_Command}"
Visibility="{Binding Buttons_Visibility}"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Grid.Column="3" Content="{Binding DoNotSave_Msg}"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="{Binding DoNotSave_Msg}"
Command="{Binding DoNotSave_Command}"
Visibility="{Binding Buttons_Visibility}"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
</Grid>
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
+5 -4
View File
@@ -8,17 +8,18 @@
IsEnabled="{Binding CALCPanel_IsEnabled}"
Visibility="{Binding ChooseMachineBtn_Visibility}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/ChooseMachine.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Grid Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
<Grid Visibility="{Binding ChooseMachine_Visibility}"
Style="{StaticResource CalcPanel_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<!--Combobox per selezionare la macchina corrente-->
<ComboBox Grid.Column="0"
ItemsSource="{Binding Path=MachineList}"
<ComboBox ItemsSource="{Binding Path=MachineList}"
DisplayMemberPath="Name"
SelectedItem="{Binding Path=SelectedMachine}"
SelectedValuePath="Name"
EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml
+24 -28
View File
@@ -7,16 +7,15 @@
Title="ChangeMaterialWnd"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid HorizontalAlignment="Center"
Grid.Row="0"
Margin="0,0,0,5">
<Grid Grid.Row="0"
Style="{StaticResource ChangeMaterialWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -26,31 +25,28 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ProjMaterial_Msg}"
Style="{StaticResource OptionTextBlock}"/>
<ComboBox ItemsSource="{Binding ProjMaterialList}"
SelectedItem="{Binding SelProjMaterial}"
Grid.Column="1"
Width="150"
Style="{StaticResource Feature_ComboBox}"/>
Style="{StaticResource Option_TextBlock}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding ProjMaterialList}"
SelectedItem="{Binding SelProjMaterial}"
Style="{StaticResource ProjMaterial_ComboBox}"/>
</Grid>
<Grid HorizontalAlignment="Center"
Grid.Row="1"
Margin="0,0,0,5">
<Grid Grid.Row="1"
Style="{StaticResource ChangeMaterialWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding WjMaterial_Msg}"
Style="{StaticResource OptionTextBlock}"/>
<ComboBox ItemsSource="{Binding WhMaterialList}"
SelectedItem="{Binding SelWhMaterial}"
Grid.Column="1"
Width="150"
Style="{StaticResource Feature_ComboBox}"/>
Style="{StaticResource Option_TextBlock}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding WhMaterialList}"
SelectedItem="{Binding SelWhMaterial}"
Style="{StaticResource ProjMaterial_ComboBox}"/>
</Grid>
<Grid Grid.Row="2"
Margin="0,0,0,5">
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -58,15 +54,15 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding Ok_Msg}"
<Button Grid.Column="1"
Content="{Binding Ok_Msg}"
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
IsDefault="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="{Binding Cancel_Msg}"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml
+30 -29
View File
@@ -10,7 +10,7 @@
Title="ChangeParameterWnd"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
@@ -28,49 +28,50 @@
</Grid.RowDefinitions>
<TextBlock Text="Process"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding PRCList}"
SelectedItem="{Binding SelPRC}"
DisplayMemberPath="ghDesc"
HorizontalAlignment="Stretch"
Style="{StaticResource Feature_ComboBox}"/>
Style="{StaticResource PRCList_ComboBox}"/>
<TextBlock Grid.Row="2"
Text="Parameter"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<ComboBox Grid.Row="2" Grid.Column="1"
ItemsSource="{Binding ParamList}"
SelectedItem="{Binding SelParam}"
DisplayMemberPath="sNameAndDescription"
HorizontalAlignment="Stretch"
Style="{StaticResource Feature_ComboBox}"/>
Style="{StaticResource PRCList_ComboBox}"/>
<TextBlock Grid.Row="4"
Text="Actual value"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="4" Grid.Column="1"
Text="{Binding SelParam.sActualValue}"
Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
<CheckBox Grid.Row="4" Grid.Column="1"
<CheckBox Grid.Row="4"
Grid.Column="1"
IsChecked="{Binding SelParam.bActualValue}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
Visibility="{Binding SelParam.IsCheckBox_Visibility}"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
<TextBlock Grid.Row="6" Text="New Value"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="6" Grid.Column="1"
<TextBlock Grid.Row="6"
Text="New Value"
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="6"
Grid.Column="1"
Text="{Binding SelParam.sNewValue}"
Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
<CheckBox Grid.Row="6" Grid.Column="1"
<CheckBox Grid.Row="6"
Grid.Column="1"
IsChecked="{Binding SelParam.bNewValue}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
Visibility="{Binding SelParam.IsCheckBox_Visibility}"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
<Grid Grid.Row="8" Grid.ColumnSpan="2"
Margin="0,0,0,5">
<Grid Grid.Row="8"
Grid.ColumnSpan="2"
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -78,15 +79,15 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="Ok"
<Button Grid.Column="1"
Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Content="Cancel"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
IsDefault="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
+10 -7
View File
@@ -13,19 +13,21 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="6*"/>
</Grid.RowDefinitions>
<TabControl Grid.RowSpan="2" Grid.ColumnSpan="2"
<TabControl Grid.RowSpan="2"
Grid.ColumnSpan="2"
SelectedIndex="{Binding SelConfigSubPage}"
Style="{StaticResource Optimizer_TabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Orientation="Horizontal" Margin="5">
<StackPanel Style="{StaticResource ConfigurationProgram_StackPanel}">
<TextBlock Text="{Binding General_Msg}"
FontSize="15"/>
Style="{StaticResource ConfigurationProgram_TextBlock}"/>
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding General_Visibility}"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/Save.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</TabItem.Header>
@@ -35,14 +37,15 @@
</TabItem>
<TabItem>
<TabItem.Header>
<StackPanel Orientation="Horizontal" Margin="5">
<StackPanel Style="{StaticResource ConfigurationProgram_StackPanel}">
<TextBlock Text="{Binding PDFEditor_Msg}"
FontSize="15"/>
Style="{StaticResource ConfigurationProgram_TextBlock}"/>
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding PDFEditor_Visibility}"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/Save.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</TabItem.Header>
EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
+6 -3
View File
@@ -8,19 +8,22 @@
ToolTip="{Binding CopyFeature_ToolTip}"
IsEnabled="{Binding CopyFeature_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/LeftPanel/CopyFeature.png" Stretch="Uniform"/>
<Image Source="/Resources/LeftPanel/CopyFeature.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding AddFeature_Command}"
ToolTip="{Binding AddFeature_ToolTip}"
IsEnabled="{Binding AddFeature_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/LeftPanel/AddFeature.png" Stretch="Uniform"/>
<Image Source="/Resources/LeftPanel/AddFeature.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding RemoveFeature_Command}"
ToolTip="{Binding RemoveFeature_ToolTip}"
IsEnabled="{Binding RemoveFeature_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Remove.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
+8 -7
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
Margin="30,4,0,2">
Style="{StaticResource FeatureManager_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
@@ -20,7 +20,7 @@
<Expander Header="{Binding Face_Msg}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Width="80">
Style="{StaticResource FeatureManager_Expander}">
<ListBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -30,7 +30,7 @@
<Expander Grid.Column="1"
Header="{Binding Group_Msg}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Width="80">
Style="{StaticResource FeatureManager_Expander}">
<ListBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -41,7 +41,7 @@
Text="{Binding Priority_Msg}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Visibility="{Binding Priority_Visibility}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="3"
Text="{Binding Tag.sPriority,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}},
@@ -74,12 +74,13 @@
Command="{Binding Tag.Cancel_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
Style="{StaticResource GeneralConfiguration_Button}"/>
<Button Grid.Column="9" HorizontalAlignment="Right"
<Button Grid.Column="9"
Command="{Binding MacroFeature_Command}"
ToolTip="{Binding MacroFeature_ToolTip}"
IsEnabled="{Binding MacroFeature_IsEnabled}"
Style="{StaticResource FeatureMan_Button}">
<Image Source="/Resources/LeftPanel/MacroFeature.png" Stretch="Uniform"/>
Style="{StaticResource MacroFeaturen_Button}">
<Image Source="/Resources/LeftPanel/MacroFeature.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml
+7 -21
View File
@@ -8,45 +8,31 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Margin="2,0,2,0"
Grid.RowSpan="2"
Style="{StaticResource Optimizer_Border}">
<Border Grid.RowSpan="2"
Style="{StaticResource ForcedStrategyBTL_Border}">
<ListBox ItemsSource="{Binding StrategyList}"
SelectedItem="{Binding SelStrategy}"
IsSynchronizedWithCurrentItem="True"
HorizontalAlignment="Left"
Style="{StaticResource NewAddFeature_ListBox}">
Style="{StaticResource ForcedStrategyBTL_ListBox}">
<ListBox.Resources>
<DataTemplate DataType="{x:Type Optimizer:Strategy}">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
GroupName="ForcedStrategy"/>
<Image Source="{Binding sStrategyImagePath}"
Stretch="Uniform"
Width="100"
Height="100"/>
Style="{StaticResource ForcedStrategyBTL_Image}"/>
<TextBlock Text="{Binding sStrategyName}"
Style="{StaticResource DialogWindow_TextBlock}"/>
</StackPanel>
</DataTemplate>
</ListBox.Resources>
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<!--<EventSetter Event="PreviewMouseDown" Handler="AvailableStrategyList_PreviewMouseDown"/>-->
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Border>
<GroupBox Grid.Column="1"
Foreground="Black"
BorderThickness="2"
Margin="0,-5,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}">
Style="{StaticResource ForcedStrategyBTL_GroupBox}">
<GroupBox.Header>
<TextBlock Text="{Binding SelStrategy.sStrategyName}"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
</GroupBox.Header>
<Optimizer:ParameterStrategyV Tag="{Binding SelStrategy}"/>
</GroupBox>
EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
+6 -20
View File
@@ -12,44 +12,30 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Grid.RowSpan="2"
Margin="2,0,2,0"
Style="{StaticResource Optimizer_Border}">
Style="{StaticResource ForcedStrategyBTL_Border}">
<ListBox ItemsSource="{Binding StrategyList}"
SelectedItem="{Binding SelStrategy}"
Height="Auto"
IsSynchronizedWithCurrentItem="True"
Style="{StaticResource NewAddFeature_ListBox}">
Style="{StaticResource ForcedStrategyBTL_ListBox}">
<ListBox.Resources>
<DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
GroupName="ForcedStrategy"/>
<Image Source="{Binding sStrategyImagePath}"
Stretch="Uniform"
Width="100"
Height="100"/>
Style="{StaticResource ForcedStrategyBTL_Image}"/>
<TextBlock Text="{Binding sStrategyName}"
Style="{StaticResource DialogWindow_TextBlock}"/>
</StackPanel>
</DataTemplate>
</ListBox.Resources>
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<!--<EventSetter Event="PreviewMouseDown" Handler="AvailableStrategyList_PreviewMouseDown"/>-->
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Border>
<GroupBox Grid.Column="1"
Foreground="Black"
BorderThickness="2"
Margin="0,-5,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}">
Style="{StaticResource ForcedStrategyBTL_GroupBox}">
<GroupBox.Header>
<TextBlock Text="{Binding SelStrategy.sStrategyName}"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
</GroupBox.Header>
<OPTIMIZER:ParameterStrategyV Tag="{Binding SelStrategy}"/>
</GroupBox>
EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml
+5 -15
View File
@@ -1,23 +1,13 @@
<UserControl x:Class="FreeContourInputV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Height="32">
Style="{StaticResource FreeContourInput_UserControl}">
<StackPanel>
<StackPanel.Style>
<Style TargetType="{x:Type StackPanel}">
<Setter Property="Orientation" Value="Horizontal"/>
<Style.Triggers>
<DataTrigger Binding="{Binding FocusTextBox}" Value="True">
<Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</StackPanel.Style>
<StackPanel Style="{StaticResource FreeContourInput_StackPanel}">
<TextBlock Text="{Binding Message}"
Visibility="{Binding Message_Visibility}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Text_Visibility}"
Style="{StaticResource FreeContour_TextBox}">
@@ -33,8 +23,8 @@
<ComboBox ItemsSource="{Binding ComboItemsList}"
SelectedIndex="{Binding ComboSelectedIndex}"
Visibility="{Binding Combo_Visibility}"
Margin="5,0,5,0"/>
<Grid Margin="5,0,5,0">
Style="{StaticResource FreeContourInput_ComboBox}"/>
<Grid Style="{StaticResource FreeContourInput_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
+20 -10
View File
@@ -14,53 +14,63 @@
ToolTip="{Binding Line2P_ToolTip}"
IsEnabled="{Binding Line2P_IsEnabled}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/Line2P.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Delete_Command}"
ToolTip="{Binding Delete_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ModifyCurve_Command}"
ToolTip="{Binding ModifyCurve_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/ModifyCurve.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding AddPointCurve_Command}"
ToolTip="{Binding AddPointCurve_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/AddPointCurve.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding RemovePointCurve_Command}"
ToolTip="{Binding RemovePointCurve_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/RemovePointCurve.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ChangeStart_Command}"
ToolTip="{Binding ChangeStart_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/ChangeStart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding InvertCurve_Command}"
ToolTip="{Binding InvertCurve_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/InvertCurve.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Move_Command}"
ToolTip="{Binding Move_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/Move.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Rotate_Command}"
ToolTip="{Binding Rotate_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/Rotate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding TextAngle_Command}"
ToolTip="{Binding TextAngle_ToolTip}"
Visibility="{Binding TextAngle_Visibility}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
<Image Source="/Resources/DrawPanel/Text.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
+3 -4
View File
@@ -21,13 +21,12 @@
<OPTIMIZER:ProjectParametersV Margin="0,10,0,0"/>
<StackPanel Grid.Row="1"
Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="10">
Style="{StaticResource GeneralParametersStrategy_StackPanel}">
<Button Command="{Binding Ok_Command}"
ToolTip="{Binding SaveAsToolTip}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
+16 -11
View File
@@ -10,7 +10,7 @@
Name="GeneralParametersWnd"
Style="{StaticResource OptimizerWindow.Dialog}">
<Grid Margin="10">
<Grid Style="{StaticResource GeneralParametersWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
@@ -19,19 +19,24 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<ComboBox ItemsSource="{Binding StrategySetupList}"
<ComboBox Grid.ColumnSpan="2"
ItemsSource="{Binding StrategySetupList}"
SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="0,10,0,10"
Style="{StaticResource Strategy_ComboBox}" />
<OPTIMIZER:ProjectParametersV Grid.Row="1" Grid.RowSpan="2" IsEnabled="{Binding GeneralParametersIsEnable}"/>
<UniformGrid Rows="2" Grid.Row="1" Grid.Column="1" Margin="0,0,5,0">
Style="{StaticResource BTLDataWnd_ComboBox}"/>
<OPTIMIZER:ProjectParametersV Grid.Row="1"
Grid.RowSpan="2"
IsEnabled="{Binding GeneralParametersIsEnable}"/>
<UniformGrid Grid.Row="1"
Grid.Column="1"
Rows="2"
Style="{StaticResource BTLDataWnd_UniformGrid}">
<CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Top" HorizontalAlignment="Center" Margin="10,10,0,0"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
<Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="5,0,0,5"
Style="{StaticResource BTLDataWnd_CheckBox}"/>
<Button Command="{Binding Ok_Command}"
ToolTip="{Binding SaveAsToolTip}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
Style="{StaticResource GeneralParametersWnd_Button}">
<Image Source="/Resources/NewPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</UniformGrid>
</Grid>
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
+49 -86
View File
@@ -11,19 +11,13 @@
</CollectionViewSource>
</UserControl.Resources>
<GroupBox Foreground="Black"
BorderThickness="2"
Margin="0,-11,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}">
<GroupBox Style="{StaticResource ProjectParameters_GroupBox}">
<GroupBox.Header>
<TextBlock Text="GENERAL PARAMETERS"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ProjectParameters_TextBlock}"/>
</GroupBox.Header>
<ItemsControl ItemsSource="{Binding Source={StaticResource GroupedParameters}}"
Foreground="Black"
Margin="5,10,0,0"
Style="{StaticResource UsersControlStyle}">
Style="{StaticResource ParameterStrategy_ItemsControl}">
<ItemsControl.GroupStyle>
<GroupStyle>
<GroupStyle.Panel>
@@ -36,14 +30,10 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<GroupBox Margin="0,5,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="1"
Foreground="Black">
<GroupBox Style="{StaticResource Item_GroupBox}">
<GroupBox.Header>
<TextBlock Text="{Binding Name}"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ProjectParameters_TextBlock}"/>
</GroupBox.Header>
<ItemsPresenter />
<GroupBox.Visibility>
@@ -62,60 +52,50 @@
<ItemsControl.Resources>
<DataTemplate DataType="{x:Type OPTIMIZER:BooleanGenericParameter}">
<UniformGrid Columns="2"
Margin="2,2,2,5"
Visibility="{Binding bBooleanVisibility}">
Visibility="{Binding bBooleanVisibility}"
Style="{StaticResource ProjectParameters_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ProjectParameters_TextBlock}"/>
<CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:DoubleGenericParameter}">
<UniformGrid Columns="2"
Margin="2,2,2,5"
Visibility="{Binding bDoubleVisibility}">
Visibility="{Binding bDoubleVisibility}"
Style="{StaticResource ProjectParameters_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ProjectParameters_TextBlock}"/>
<TextBox Text="{Binding sValue}"
Style="{StaticResource ColorPicker_TextBox}"/>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:ComboGenericParameter}">
<UniformGrid Columns="2"
Margin="2,2,2,5"
Visibility="{Binding bComboBoxVisibility}">
Visibility="{Binding bComboBoxVisibility}"
Style="{StaticResource ProjectParameters_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ProjectParameters_TextBlock}"/>
<ComboBox ItemsSource="{Binding ComboList}"
SelectedItem="{Binding SelValue}"
DisplayMemberPath="sValue"
Margin="0"
Foreground="Black"
Style="{StaticResource CalcPanel_ComboBox}">
Style="{StaticResource ProjectParameters_ComboBox}">
</ComboBox>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:StringGenericParameter}">
<UniformGrid Columns="2"
Margin="5,2,5,0"
Visibility="{Binding bStringVisibility}">
Visibility="{Binding bStringVisibility}"
Style="{StaticResource ProjectParameters_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ProjectParameters_TextBlock}"/>
<TextBox Text="{Binding sValue}"
Style="{StaticResource ColorPicker_TextBox}"/>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:ListGenericParameter}">
<Grid Margin="5,5,5,0"
Visibility="{Binding bListBoxVisibility}">
<Grid Visibility="{Binding bListBoxVisibility}"
Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -125,39 +105,28 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
VerticalAlignment="Top"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="0,7,5,0" HorizontalAlignment="Right">
<Button VerticalAlignment="Top"
Width="50"
Margin="0,0,0,5"
ToolTip="{Binding OpenToolListToolTip}"
Style="{StaticResource ListProjectParameters_TextBlock}"/>
<StackPanel Grid.Column="1"
Style="{StaticResource PartManager_StackPanel}">
<StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
<Button ToolTip="{Binding OpenToolListToolTip}"
IsEnabled="{Binding OpenToolListIsEnable}"
Command="{Binding OpenToolListCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/NewPage/+.png" Stretch="Uniform"/>
Style="{StaticResource ProjectParameters_Button}">
<Image Source="/Resources/NewPage/+.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button VerticalAlignment="Top"
Width="50"
Margin="0"
ToolTip="{Binding DeselectAllToolTip}"
<Button ToolTip="{Binding DeselectAllToolTip}"
IsEnabled="{Binding ActiveToolListIsEnable}"
Command="{Binding DeselectAllCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/NewPage/deselectall.png" Stretch="Uniform"/>
Style="{StaticResource CloseProjectParameters_Button}">
<Image Source="/Resources/NewPage/deselectall.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
<Border Margin="2,0,2,0"
Style="{StaticResource Optimizer_Border}">
<Border Style="{StaticResource ForcedStrategyBTL_Border}">
<ItemsControl ItemsSource="{Binding ActiveToolList_View}"
BorderThickness="0"
Height="95"
Width="180"
Foreground="Black"
Style="{StaticResource UsersControlStyle}">
Style="{StaticResource ProjectParameters_ItemsControl}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Style="{StaticResource List_StackPanel}">
@@ -171,34 +140,28 @@
</ItemsControl>
</Border>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Visibility="{Binding AvailableToolListVisibility}">
<StackPanel Orientation="Vertical" Margin="0,7,5,0" HorizontalAlignment="Right">
<Button VerticalAlignment="Top"
Width="50"
Margin="0,0,0,5"
ToolTip="{Binding CloseToolListToolTip}"
<StackPanel Grid.Row="1"
Grid.Column="1"
Visibility="{Binding AvailableToolListVisibility}"
Style="{StaticResource PartManager_StackPanel}">
<StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
<Button ToolTip="{Binding CloseToolListToolTip}"
Command="{Binding CloseToolListCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
Style="{StaticResource ProjectParameters_Button}">
<Image Source="/Resources/PDFEditor/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button VerticalAlignment="Top"
Width="50"
Margin="0,0,0,5"
ToolTip="{Binding SelectAllToolTip}"
<Button ToolTip="{Binding SelectAllToolTip}"
IsEnabled="{Binding AvailableToolListIsEnable}"
Command="{Binding SelectAllCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/NewPage/selectall.png" Stretch="Uniform"/>
Style="{StaticResource ProjectParameters_Button}">
<Image Source="/Resources/NewPage/selectall.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
<Border Margin="2,5,2,0"
Style="{StaticResource Optimizer_Border}">
<Border Style="{StaticResource ProjectParamters_Border}">
<ItemsControl ItemsSource="{Binding AvailableToolList_View}"
BorderThickness="0"
Height="200"
Width="180"
Foreground="Black"
Style="{StaticResource UsersControlStyle}">
Style="{StaticResource AvailableToolList_ItemsControl}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Style="{StaticResource List_StackPanel}">
EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml
+3 -4
View File
@@ -8,22 +8,21 @@
Title="InputPwdWndV"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0"
Text="{Binding PasswordMsg}"
<TextBlock Text="{Binding PasswordMsg}"
Style="{StaticResource PasswordMsg_TextBlock}"/>
<PasswordBox Grid.Row="1"
x:Name="PwdBox"
PasswordChanged="PasswordBox_PasswordChanged"/>
<Grid Grid.Row="2"
Margin="0,0,0,5">
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
+5 -4
View File
@@ -6,7 +6,8 @@
<ToggleButton ToolTip="{Binding GetDistToolTip}"
IsChecked="{Binding GetDistIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
<Image Source="/Resources/InstrumentPanel/GetDist.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</ToggleButton>
<Button ToolTip="{Binding ChangeParam_ToolTip}"
@@ -14,7 +15,8 @@
Visibility="{Binding ChangeParam_Visibility}"
IsEnabled="{Binding InstrumentPanel_IsEnabled}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/InstrumentPanel/ChangeParam.png" Stretch="Uniform"/>
<Image Source="/Resources/InstrumentPanel/ChangeParam.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Content="MAT"
@@ -22,7 +24,6 @@
Command="{Binding ChangeMaterial_Command}"
Visibility="{Binding ChangeMaterial_Visibility}"
IsEnabled="{Binding InstrumentPanel_IsEnabled}"
FontSize="12"
Style="{StaticResource ToolBarViewPanel_Button}"/>
Style="{StaticResource InstrumentPanel_Button}"/>
</StackPanel>
EgtBEAMWALL.Optimizer/ItemParamList/BTLDataV.xaml
+65 -64
View File
@@ -5,145 +5,146 @@
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
<UniformGrid Margin="5"
Columns="6" Rows="7">
Columns="6"
Rows="7">
<TextBlock Text="{Binding PROJNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROJNAME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROJPART_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROJGUID_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding LISTNAME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding CUSTOMER_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ARCHITECT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EDITOR_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding DELIVDATE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPDATE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPTIME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPRELEASE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding LANGUAGE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding RANGE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
Path=Tag.ocRANGE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
Path=Tag.SelRANGE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
Path=Tag.ocPROCESSINGQUALITY,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
Path=Tag.SelPROCESSINGQUALITY,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding COMPUTERNAME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding USER_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding SRCFILE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPFILE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding RECESS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
Path=Tag.ocRECESS,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
Path=Tag.SelRECESS,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding USERATTRIBUTE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+55 -52
View File
@@ -48,39 +48,39 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<Expander IsExpanded="True" HorizontalAlignment="Left"
Width="{Binding ActualWidth, Converter={StaticResource ExpanderWidthConverter}, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}}}">
<Expander Width="{Binding ActualWidth, Converter={StaticResource ExpanderWidthConverter}, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}}}"
Style="{StaticResource BTLPartList_Expander}">
<Expander.Header>
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding Path=Name}"
Margin="0,0,5,0" FontSize="14"/>
Style="{StaticResource BTLPartList_TextBlock}"/>
<TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
Margin="0,0,5,0" FontSize="14"/>
Style="{StaticResource BTLPartList_TextBlock}"/>
<Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Height="23.5" Width="25" Margin="5,0,0,0"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/adjustment.png" Stretch="Uniform"/>
Style="{StaticResource BTLPartList_Button}">
<Image Source="/Resources/NewPage/adjustment.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Height="23.5" Width="25" Margin="5,0,0,0"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
Style="{StaticResource BTLPartList_Button}">
<Image Source="/Resources/LeftPanel/AddPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding Path=Name}"
ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Height="23.5" Width="25" Margin="5,0,0,0"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/ProjectManager/UpdateBTL.png" Stretch="Uniform"/>
Style="{StaticResource BTLPartList_Button}">
<Image Source="/Resources/ProjectManager/UpdateBTL.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Expander.Header>
<Expander.Content>
<ItemsPresenter />
<ItemsPresenter/>
</Expander.Content>
</Expander>
</ControlTemplate>
@@ -236,7 +236,7 @@
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -278,7 +278,8 @@
<DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/RotateIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/RotateIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -289,14 +290,14 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sROTATED}"
TextAlignment="Center"
Margin="2,0,2,0"/>
Style="{StaticResource Rotate_TextBlock}"/>
<Button Grid.Column="1"
Command="{Binding ForwardRotation_Command}"
ToolTip="{Binding ForwardRotation_ToolTip}"
IsEnabled="{Binding RotatePart_IsEnabled}"
Style="{StaticResource BTLPanel_Button}">
<Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Rotate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
</DataTemplate>
@@ -306,14 +307,14 @@
<DataGridTemplateColumn x:Key="colFLIP">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/InversionIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/InversionIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding IsInverted, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -321,7 +322,8 @@
<DataGridTemplateColumn x:Key="colVERIFY">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/VerifyIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/VerifyIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -330,7 +332,8 @@
Command="{Binding Verify_Command}"
IsEnabled="{Binding Verify_IsEnabled}"
Style="{StaticResource BTLPanel_Button}">
<Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Verify.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -339,7 +342,8 @@
<DataGridTemplateColumn x:Key="colADD">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/AddToRawPartIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/AddToRawPartIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -349,7 +353,8 @@
ToolTip="{Binding AddToRawPart_ToolTip}"
IsEnabled="{Binding BTLPartManager_IsEnabled}"
Style="{StaticResource BTLPanel_Button}">
<Image Source="/Resources/LeftPanel/AddToRawPart.png" Stretch="Uniform"/>
<Image Source="/Resources/LeftPanel/AddToRawPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -358,7 +363,8 @@
<DataGridTemplateColumn x:Key="colSETTING">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/SettingIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/SettingIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -368,12 +374,10 @@
ToolTip="{Binding Settings_Command_ToolTip}"
Style="{StaticResource BTLPanel_Button}"
Click="OpenPopUp_Click">
<Image Source="/Resources/NewPage/Setting.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Setting.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Popup AllowsTransparency="True"
PopupAnimation="None"
Placement="Right"
StaysOpen="False">
<Popup Style="{StaticResource BTLPartList_PopUp}">
<Popup.VerticalOffset>
<MultiBinding Converter="{StaticResource DataGridCellBorderThicknessConverter}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
@@ -403,10 +407,7 @@
ItemsSource="{Binding BTLFeatureVMList}"
SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
PreviewMouseWheel="ListBox_PreviewMouseWheel"
Grid.IsSharedSizeScope="True"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto"
Style="{StaticResource BTL_ListBox}">
Style="{StaticResource BTLPartList_ListBox}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"
@@ -418,7 +419,7 @@
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Margin="0,0,50,0">
<Grid Style="{StaticResource BTLPartList_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="40"/>
@@ -446,7 +447,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
@@ -455,9 +456,7 @@
</Grid>
<CheckBox Grid.Column="2"
IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="0,0,5,0"/>
Style="{StaticResource BTLPartList_CheckBox}"/>
<TextBlock Grid.Column="3"
Text="["
Style="{StaticResource Prod_TextBlock}"/>
@@ -474,28 +473,32 @@
Text="] "
Style="{StaticResource Prod_TextBlock}"/>
<TextBlock Grid.Column="8"
Text="{Binding sName}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource Prod_TextBlock}"/>
Text="{Binding sName}"
Style="{StaticResource Name_TextBlock}"/>
<Button Grid.Column="9"
Command="{Binding EditFeature_Command}"
Click="SelectButton_Click"
Style="{StaticResource EditFeature_Button}">
<Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Edit.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<StackPanel Grid.Row="1" Grid.ColumnSpan="2" Orientation="Horizontal" Margin="0,2,0,0"
Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}">
<TextBlock Text="STATUS:" Foreground="{StaticResource BeamWall_Corduroy}" HorizontalAlignment="Left" Margin="0,0,10,0"/>
<StackPanel Grid.Row="1"
Grid.ColumnSpan="2"
Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
Style="{StaticResource BTLPartList_StackPanel}">
<TextBlock Text="STATUS:"
Style="{StaticResource Status_TextBlock}"/>
<TextBlock Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
HorizontalAlignment="Left" Foreground="{StaticResource BeamWall_Corduroy}"
Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"/>
Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
Style="{StaticResource SelBTLPart_TextBlock}"/>
<TextBlock Text="{Binding Tag.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
HorizontalAlignment="Left" Foreground="{StaticResource BeamWall_Corduroy}" />
Style="{StaticResource SelBTLPart_TextBlock}"/>
</StackPanel>
</Grid>
</DataTemplate>
EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+5 -6
View File
@@ -49,13 +49,13 @@
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="1"
HorizontalAlignment="Center">
Style="{StaticResource FeatureInPartInRawPartList_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
@@ -92,15 +92,14 @@
<DataTemplate>
<Button ToolTip="{Binding Strategy_ToolTip}"
Command="{Binding Strategy_Command}"
Height="15" Width="15" Margin="0"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
Style="{StaticResource FeatureInPartInRawPartList_Button}">
<Image Source="/Resources/CALCPanel/Verify.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Resources>
</EgwWPFBaseLib:EgwDataGrid>
</UserControl>
EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
+8 -7
View File
@@ -44,7 +44,7 @@
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
VerticalAlignment="Center"/>
Style="{StaticResource PParameters_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -126,23 +126,24 @@
</DataGrid.Resources>
</EgwWPFBaseLib:EgwDataGrid>
<Image Grid.Column="1" Width="250"
<Image Grid.Column="1"
Source="{Binding sCurrDraw}"
Margin="2.5"/>
Style="{StaticResource CurrDraw_Image}"/>
<StackPanel Grid.Row="1"
Grid.ColumnSpan="2"
HorizontalAlignment="Right"
Style="{StaticResource PartManager_StackPanel}">
Style="{StaticResource PParameters_StackPanel}">
<Button Command="{Binding Ok_Command}"
ToolTip="{Binding Ok_Msg}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Cancel_Command}"
ToolTip="{Binding Cancel_Msg}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
EgtBEAMWALL.Optimizer/ItemParamList/PartParametersV.xaml
+178 -164
View File
@@ -17,77 +17,79 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<UniformGrid Columns="2" Margin="0,0,0,-45">
<UniformGrid Columns="2"
Style="{StaticResource PartParameters_UniformGrid}">
<TextBlock Text="{Binding NAM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding COUNT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ORDERNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PLANINGLEN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding STARTOFFSET_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ENDOFFSET_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding DESIGN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding GROUP_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding STOREY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ANNOT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding MATERIAL_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="1" Margin="0,55">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="1"
Style="{DynamicResource PartParam_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -97,110 +99,111 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding COLOUR_MSG}"
Grid.Row="0"
Style="{StaticResource PartParam_TextBlock}"/>
<Button Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
Style="{StaticResource PartParam_TextBlock}"/>
<Button Grid.Column="1"
Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="0"
Grid.Column="1"
Width="100"
Style="{StaticResource ToolBar_SmallButton}"/>
<TextBlock Text="{Binding TRANSPARENCY_MSG}"
Grid.Row="1"
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParameters_Button}"/>
<TextBlock Grid.Row="1"
Text="{Binding TRANSPARENCY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<UniformGrid Grid.Column="1" Columns="2" Margin="0,0,0,-45">
<UniformGrid Grid.Column="1"
Columns="2"
Style="{StaticResource PartParameters_UniformGrid}">
<TextBlock Text="{Binding TIMBERGRADE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding QUALITYGRADE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PACKAGE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ELEMENTNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding MODULENUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocPROCESSINGQUALITY,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelPROCESSINGQUALITY,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding RECESS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocRECESS,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelRECESS,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding STOREYTYPE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocSTOREYTYPE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelSTOREYTYPE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding LAYER_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding COMMENT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="1" Grid.Column="1" Margin="0,55">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="1"
Grid.Column="1"
Style="{DynamicResource PartParam_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -211,29 +214,28 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding REFSIDE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocREFSIDE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelREFSIDE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding REFSIDEALIGN_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding REFSIDEALIGN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<CheckBox Grid.Row="1"
Grid.Column="1"
IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.bREFSIDEALIGN,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Grid.Row="1"
Grid.Column="1"/>
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
</Grid>
</GroupBox>
<Grid Grid.Row="0" Grid.Column="2" Grid.RowSpan="2">
<Grid Grid.Column="2"
Grid.RowSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -254,7 +256,9 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
<GroupBox Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{DynamicResource NoHeader_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -266,25 +270,26 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding GRAINDIRECTION_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding GRAINDIRALIGN_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding GRAINDIRALIGN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<CheckBox Grid.Row="1"
Grid.Column="1"
IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.bGRAINDIRALIGN,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Grid.Row="1"
Grid.Column="1"
Margin="0,5"/>
Style="{StaticResource PartParameters_CheckBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="2" Grid.RowSpan="2" Grid.ColumnSpan="2">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="2"
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{DynamicResource NoHeader_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -295,26 +300,29 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding CAMBERSIDE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocCAMBERSIDE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelCAMBERSIDE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding CAMBERPARAMS_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding CAMBERPARAMS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="4" Grid.RowSpan="2" Grid.ColumnSpan="2">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="4"
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{DynamicResource NoHeader_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -325,26 +333,29 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding REFSIDEFIXCLAMP_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocREFSIDEFIXCLAMP,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelREFSIDEFIXCLAMP,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding PARTOFFSETPARAMS_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding PARTOFFSETPARAMS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="6" Grid.RowSpan="2" Grid.ColumnSpan="2">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="6"
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{DynamicResource NoHeader_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -355,26 +366,29 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding MATERIALTYPEGRP_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocMATERIALTYPEGRP,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelMATERIALTYPEGRP,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding MATERIALTYPESPEC_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding MATERIALTYPESPEC_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="8" Grid.RowSpan="2" Grid.ColumnSpan="2">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="8"
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{DynamicResource NoHeader_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -385,31 +399,33 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ALIGNLOCATION_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocALIGNLOCATION,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelALIGNLOCATION,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding ALIGNENDTYPE_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding ALIGNENDTYPE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Row="1"
Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocALIGNENDTYPE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelALIGNENDTYPE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Row="1"
Grid.Column="1"
Margin="0,5"
Style="{StaticResource PartParam_ComboBox}"/>
Style="{StaticResource PartParameters_ComboBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="10" Grid.RowSpan="4" Grid.ColumnSpan="2">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="10"
Grid.RowSpan="4"
Grid.ColumnSpan="2"
Style="{DynamicResource NoHeader_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -422,42 +438,40 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding UID_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.ocUID,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
Path=Tag.SelUID,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding TRANSFORIG_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding TRANSFORIG_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding TRANSFVERSX_MSG}"
Grid.Row="2"
<TextBlock Grid.Row="2"
Text="{Binding TRANSFVERSX_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="2"
<EgtWPFLib5:EgtTextBox Grid.Row="2"
Grid.Column="1"
Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding TRANSFVERSY_MSG}"
Grid.Row="3"
<TextBlock Grid.Row="3"
Text="{Binding TRANSFVERSY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Grid.Row="3"
<EgtWPFLib5:EgtTextBox Grid.Row="3"
Grid.Column="1"
Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
</Grid>
</Grid>
</UniformGrid>
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+61 -60
View File
@@ -33,8 +33,7 @@
<DataGrid.Resources>
<!--ID - Id gruppo-->
<DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}"
SortMemberPath="nName">
<DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}" SortMemberPath="nName">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.ID_Msg, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -51,7 +50,7 @@
<DataGridTemplateColumn x:Key="colCALC">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid Margin="5,0,-4,0">
<Grid Style="{StaticResource RawPartList_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
@@ -64,13 +63,13 @@
Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="2"
HorizontalAlignment="Center">
Style="{StaticResource FeatureInPartInRawPartList_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
@@ -90,7 +89,7 @@
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -104,7 +103,7 @@
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -118,7 +117,7 @@
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -132,7 +131,7 @@
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -146,7 +145,7 @@
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -181,7 +180,8 @@
<DataGridTemplateColumn x:Key="colVERIFY">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/VerifyIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/VerifyIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -190,7 +190,8 @@
Command="{Binding Verify_Command}"
IsEnabled="{Binding Verify_IsEnabled}"
Style="{StaticResource BTLPanel_Button}">
<Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Verify.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -208,7 +209,8 @@
Command="{Binding Simulate_Command}"
IsEnabled="{Binding Simulate_IsEnabled}"
Style="{StaticResource BTLPanel_Button}">
<Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Simulate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -217,7 +219,8 @@
<DataGridTemplateColumn x:Key="colPROD">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/ProduceRawPartIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/ProduceRawPartIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -226,7 +229,8 @@
ToolTip="{Binding ProduceRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Style="{StaticResource BTLPanel_Button}">
<Image Source="/Resources/TopPanel/ProduceRawPart.png" Stretch="Uniform"/>
<Image Source="/Resources/TopPanel/ProduceRawPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -235,7 +239,8 @@
<DataGridTemplateColumn x:Key="colSETTING">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/SettingIntestazione.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/SettingIntestazione.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -245,7 +250,8 @@
ToolTip="{Binding Settings_Command_ToolTip}"
Style="{StaticResource BTLPanel_Button}"
Click="Button_Click">
<Image Source="/Resources/NewPage/Setting.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Setting.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Popup AllowsTransparency="True"
PopupAnimation="Scroll"
@@ -256,34 +262,39 @@
ToolTip="{Binding CopyRawPart_ToolTip}"
Click="ClosePopUp_Click"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/TopPanel/CopyRawPart.png" Stretch="Uniform"/>
<Image Source="/Resources/TopPanel/CopyRawPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<!--DELETE - Elimina-->
<Button Command="{Binding RemoveRawPart_Command}"
ToolTip="{Binding RemoveRawPart_ToolTip}"
Click="ClosePopUp_Click"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Remove.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<!--CAM - CAM-->
<Button ToolTip="{Binding Simulate_ToolTip}"
Command="{Binding Simulate_Command}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/Simulate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<!--REORDER - Riordina-->
<Button Command="{Binding ReOrderPart_Command}"
ToolTip="{Binding ReOrderPart_ToolTip}"
Click="ClosePopUp_Click"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/TopPanel/ReOrderPart.png" Stretch="Uniform"/>
<Image Source="/Resources/TopPanel/ReOrderPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<!--RESET - Reset-->
<Button Command="{Binding ResetCalc_Command}"
ToolTip="{Binding ResetCalc_ToolTip}"
Click="ClosePopUp_Click"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/ResetCalc.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Popup>
@@ -347,33 +358,23 @@
<ColumnDefinition Width="10"/>
</Grid.ColumnDefinitions>
<TextBlock Text="↓"
Foreground="Aqua"
TextAlignment="Center"
FontWeight="Bold"
FontSize="12"
Margin="0,-6,0,-2"
Visibility="{Binding CALC_FALL_Visibility}"/>
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Grid.Column="1"
Visibility="{Binding CALC_FALL_Visibility}"
Style="{StaticResource CALC_FALL_TextBlock}"/>
<Border Grid.Column="1"
Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="2"
HorizontalAlignment="Center">
Style="{StaticResource FeatureInPartInRawPartList_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Width="5"
Height="5"
Fill="{StaticResource Omag_Blue}"
Visibility="{Binding CALC_ROT_Visibility}"
HorizontalAlignment="Center"/>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
TextAlignment="Center"
FontWeight="Bold"
FontSize="12"
Margin="0,-6,0,-2"/>
Style="{StaticResource CALC_ERRRawPartList_TextBlock}"/>
</Grid>
</Grid>
</DataTemplate>
@@ -405,7 +406,8 @@
<DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/RotateIntestazioneRawPart.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/RotateIntestazioneRawPart.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
@@ -416,13 +418,12 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sROT}"
TextAlignment="Center"
Margin="2,3,0,2"/>
Style="{StaticResource ROT_TextBlock}"/>
<Button Grid.Column="1"
Command="{Binding ForwardRotation_Command}"
Margin="-5,0,5,0"
Style="{StaticResource RawPart_Button}">
<Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
Style="{StaticResource Rotation_Button}">
<Image Source="/Resources/NewPage/Rotate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
</DataTemplate>
@@ -432,14 +433,14 @@
<DataGridTemplateColumn x:Key="colFLIP">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Image Source="/Resources/NewPage/InversionIntestazioneRawPart.png" Stretch="Uniform" Height="20"/>
<Image Source="/Resources/NewPage/InversionIntestazioneRawPart.png"
Style="{StaticResource BTLPartList_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -475,7 +476,7 @@
</DataGridTextColumn.CellStyle>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -493,7 +494,7 @@
</DataGridTextColumn.CellStyle>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
@@ -541,9 +542,9 @@
<DataTemplate>
<Button Command="{Binding MoveUpPart_Command}"
ToolTip="{Binding MoveUpPart_ToolTip}"
Margin="0"
Style="{StaticResource RawPart_Button}">
<Image Source="/Resources/NewPage/MoveUp.png" Stretch="Uniform"/>
Style="{StaticResource Move_Button}">
<Image Source="/Resources/NewPage/MoveUp.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -559,9 +560,9 @@
<DataTemplate>
<Button Command="{Binding MoveDownPart_Command}"
ToolTip="{Binding MoveDownPart_ToolTip}"
Margin="0"
Style="{StaticResource RawPart_Button}">
<Image Source="/Resources/NewPage/MoveDown.png" Stretch="Uniform"/>
Style="{StaticResource Move_Button}">
<Image Source="/Resources/NewPage/MoveDown.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -577,9 +578,9 @@
<DataTemplate>
<Button Command="{Binding RemovePart_Command}"
ToolTip="{Binding RemovePart_ToolTip}"
Margin="0"
Style="{StaticResource RawPart_Button}">
<Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
Style="{StaticResource Move_Button}">
<Image Source="/Resources/NewPage/Remove.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
+34 -40
View File
@@ -2,14 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
</LinearGradientBrush>
</Grid.Background>
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
Style="{StaticResource LeftPanel_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -19,9 +13,11 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource Optimizer_Border}"/>
<Border Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{StaticResource Optimizer_Border}"/>
<Grid Margin="4,1,20,0">
<Grid Style="{StaticResource Verify_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -32,34 +28,34 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button ToolTip="{Binding VerifyAll_ToolTip}" VerticalAlignment="Top"
<Button ToolTip="{Binding VerifyAll_ToolTip}"
Command="{Binding VerifyAll_Command}"
IsEnabled="{Binding VerifyAll_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
Style="{StaticResource Verify_Button}">
<Image Source="/Resources/CALCPanel/VerifyAll.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="1"
Command="{Binding ResetCalc_Command}" VerticalAlignment="Top"
Command="{Binding ResetCalc_Command}"
ToolTip="{Binding ResetCalc_ToolTip}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
Style="{StaticResource Verify_Button}">
<Image Source="/Resources/CALCPanel/ResetCalc.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="2"
Name="FilterAllBtn" VerticalAlignment="Top"
Name="FilterAllBtn"
ToolTip="{Binding FilterAll_ToolTip}"
Command="{Binding ShowPopUpFilterBtnCommand}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/LeftPanel/All_Filter.png" Stretch="Uniform"/>
Style="{StaticResource Verify_Button}">
<Image Source="/Resources/LeftPanel/All_Filter.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Popup IsOpen="{Binding IsFilterBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=FilterAllBtn}">
PlacementTarget="{Binding ElementName=FilterAllBtn}"
Style="{StaticResource Filter_PopUp}">
<UniformGrid Columns="5"
Background="{StaticResource BeamWall_LinkWater}"
Margin="0,10,10,10">
Style="{StaticResource LeftPanel_UniformGrid}">
<Expander Header="{Binding Section_Msg}">
<ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
@@ -69,7 +65,7 @@
</Expander>
<Expander Grid.Column="1"
Header="{Binding Group_Msg}"
Margin="-2,0,0,0">
Style="{StaticResource LeftPanel_Expander}">
<ListBox ItemsSource="{Binding Tag.GroupList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelGroup, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
Style="{StaticResource LeftPanel_ListBox}"
@@ -77,7 +73,7 @@
</Expander>
<Expander Grid.Column="2"
Header="{Binding SubGroup_Msg}"
Margin="-2,0,0,0">
Style="{StaticResource LeftPanel_Expander}">
<ListBox ItemsSource="{Binding Tag.SubGroupList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelSubGroup, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
Style="{StaticResource LeftPanel_ListBox}"
@@ -85,7 +81,7 @@
</Expander>
<Expander Grid.Column="3"
Header="{Binding ParType_Msg}"
Margin="-2,0,0,0">
Style="{StaticResource LeftPanel_Expander}">
<ListBox ItemsSource="{Binding Tag.SearchParamList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
Style="{StaticResource LeftPanel_ListBox}"
@@ -93,7 +89,7 @@
</Expander>
<Expander Grid.Column="4"
Header="{Binding ParValue_Msg}"
Margin="-2,0,0,0">
Style="{StaticResource LeftPanel_Expander}">
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
Style="{StaticResource SearchText_TextBox}"/>
</Expander>
@@ -101,8 +97,7 @@
</Popup>
<Expander Grid.Column="3"
Header="{Binding Section_Msg}"
Width="135"
Margin="0,4.5,5,0">
Style="{StaticResource Section_Expander}">
<ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
DisplayMemberPath="sSectionXMaterial"
@@ -111,31 +106,30 @@
</Expander>
<EgtWPFLib5:EgtTextBox Grid.Column="4"
Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
TextAlignment="Justify"
Height="25"
Margin="0,6,4,0"
Style="{StaticResource SearchText_TextBox}"/>
Style="{StaticResource LeftPanel_TextBox}"/>
<Button Grid.Column="5" Visibility="Collapsed"
Command="{Binding RotateAll_Command}"
ToolTip="{Binding RotateAll_ToolTip}"
IsEnabled="{Binding RotateAll_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Rotate.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="6" Visibility="Collapsed"
Command="{Binding InvertAll_Command}"
ToolTip="{Binding InvertAll_ToolTip}"
IsEnabled="{Binding RotateAll_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/Inversion.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Inversion.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="7" Visibility="Collapsed"
Command="{Binding Edit_Command}"
ToolTip="{Binding MultipleModify_ToolTip}"
IsEnabled="{Binding RotateAll_IsEnabled}"
HorizontalAlignment="Right"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
Style="{StaticResource MacroFeaturen_Button}">
<Image Source="/Resources/CALCPanel/Edit.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
+31 -36
View File
@@ -3,8 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
Margin="0,10,0,10"
IsEnabled="{Binding MachPanel_IsEnabled}">
IsEnabled="{Binding MachPanel_IsEnabled}"
Style="{StaticResource MachinePanel_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -17,7 +17,7 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid Margin="0,0,5,0">
<Grid Style="{StaticResource CalcPanel_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -25,23 +25,20 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding CurrentMachineMsg}"
Margin="10,0,5,0"
Foreground="{StaticResource BeamWall_Corduroy}"
Style="{StaticResource StatisticTimePanel_TextBlock}"/>
Style="{StaticResource CurrentMachine_TextBlock}"/>
<TextBlock Grid.Column="1"
Text="{Binding SelMachineName, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center"
FontWeight="Bold"
Margin="10,0,5,0"
Foreground="{StaticResource BeamWall_Corduroy}"
Style="{StaticResource StatisticTimePanel_TextBlock}"/>
Style="{StaticResource SelMachine_TextBlock}"/>
<Button Grid.Column="2"
ToolTip="{Binding ChooseMachine_ToolTip}"
Command="{Binding ChooseMachine_Command}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/ChooseMachine.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Grid Grid.Column="3" Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
<Grid Grid.Column="3"
Visibility="{Binding ChooseMachine_Visibility}"
Style="{StaticResource CalcPanel_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -57,12 +54,12 @@
Style="{StaticResource CalcPanel_Button}"/>
</Grid>
</Grid>
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
<StackPanel Grid.Column="1"
Style="{StaticResource PParameters_StackPanel}">
<RadioButton Content="{Binding StrategyManagerMsg}"
ToolTip="{Binding ParameterMachineMsg}"
IsChecked="{Binding StrategyManagerIsChecked}"
Margin="0,0,50,0"
Style="{StaticResource MainMenu_ToggleButton}" Width="140"/>
Style="{StaticResource StrategyManager_ToggleButton}"/>
<Button Content="{Binding ToolDBMsg}"
ToolTip="{Binding ToolDBToolTip}"
Command="{Binding ToolDbCommand}"
@@ -77,15 +74,13 @@
<RadioButton Content="{Binding MachineParamsMsg}"
ToolTip="{Binding MachineParamsMsg}"
IsChecked="{Binding MachineParamsIsChecked}"
Margin="5,0,10,0"
Style="{StaticResource MainMenu_ToggleButton}" Width="155"/>
Style="{StaticResource MachineParam_ToggleButton}"/>
</StackPanel>
</Grid>
<TabControl Grid.Row="1"
BorderThickness="0"
SelectedIndex="{Binding nSelTab}"
Style="{StaticResource Optimizer_TabControl}">
Style="{StaticResource SelTab_TabControl}">
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
<Setter Property="Visibility" Value="Collapsed"/>
@@ -98,44 +93,44 @@
</StackPanel>
</TabItem>
<TabItem Header="PARAMETERS">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<ItemsControl ItemsSource="{Binding SelectedItem.MachTableList, ElementName=SelMachineCombo}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
<StackPanel x:Name="GroupStackPanel"
Style="{StaticResource PartManager_StackPanel}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto" Foreground="{StaticResource BeamWall_Corduroy}">
<ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
<GroupBox Header="{Binding sName}"
Style="{StaticResource MachinePanel_GroupBox}">
<ItemsControl Name="MachParamsItemsControl"
ItemsSource="{Binding MachParamList}"
Style="{StaticResource MachinePanel_ItemsControl}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"/>
<WrapPanel Style="{StaticResource Project_WrapPanel}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="0,0,5,5">
<Grid Style="{StaticResource MachParam_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sName}"
ToolTip="{Binding sName}"
TextWrapping="WrapWithOverflow"
Width="150"
Style="{StaticResource MachParamTextBlock}"/>
Style="{StaticResource MachinePanel_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
Width="60"/>
Style="{StaticResource Name_TextBox}"/>
<TextBlock Grid.Column="2"
Text="{Binding sDescription}"
ToolTip="{Binding sDescription}"
TextWrapping="WrapWithOverflow"
Width="148"
Style="{StaticResource MachParamTextBlock}"/>
Style="{StaticResource Description_TextBlock}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml
+19 -21
View File
@@ -8,7 +8,8 @@
WindowStyle="None"
Title="NewMacroFeature"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5">
<Grid Style="{StaticResource BlockedWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -20,37 +21,34 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="Feature"
Margin="5"
Style="{StaticResource OptionTextBlock}"/>
<TextBlock Text="{Binding sDescBTLFeature}"
Grid.Column="1"
HorizontalAlignment="Left"
Style="{StaticResource OptionTextBlock}"/>
<CheckBox Content="Default Macro"
Style="{StaticResource Feature_TextBlock}"/>
<TextBlock Grid.Column="1"
Text="{Binding sDescBTLFeature}"
Style="{StaticResource DescBTLFeature_TextBlock}"/>
<CheckBox Grid.Column="2"
Content="Default Macro"
IsChecked="{Binding bIsCustomChecked}"
Visibility="{Binding bCustomVisibility}"
Grid.Column="2"
Margin="0,6,5,0"/>
<TextBlock Text="Name"
Grid.Row="1"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sFeatureName}"
Grid.Row="1"
Visibility="{Binding bCustomVisibility}"
Style="{StaticResource DefaultMacro_CheckBox}"/>
<TextBlock Grid.Row="1"
Text="Name"
Style="{StaticResource Option_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Grid.ColumnSpan="2"
Margin="5"
Width="200"/>
Text="{Binding sFeatureName}"
Style="{StaticResource FeatureName_TextBox}"/>
<UniformGrid Columns="2"
Grid.Row="2"
Grid.ColumnSpan="3"
Margin="5">
Style="{StaticResource AddFeatureWnd_UniformGrid}">
<Button Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
+7 -9
View File
@@ -19,8 +19,7 @@
<RadioButton Content="{Binding OnlyProdPage_Msg}"
IsChecked="{Binding OnlyProdPage_IsChecked}"
Style="{StaticResource MainMenu_ToggleButton}"
Width="120"/>
Style="{StaticResource MainMenu_ToggleButton}"/>
<RadioButton Grid.Column="1"
Content="{Binding Configuration_Msg}"
@@ -36,19 +35,18 @@
<Button Grid.Column="3"
Command="{Binding SendFeedbackCommand}"
ToolTip="{Binding SendFeedbackToolTip}"
Style="{StaticResource MainMenu_Button}"
IsEnabled="{Binding SendFeedbackIsEnabled}"
Width="40">
<Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/>
Style="{StaticResource SendFeedback_Button}">
<Image Source="/Resources/MainMenu/Send.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<RadioButton Grid.Column="4"
IsChecked="{Binding ConfigProgram_IsChecked}"
ToolTip="{Binding ConfigurationProgramToolTip}"
Width="40"
Background="Transparent"
Style="{StaticResource MainMenu_ToggleButton}">
<Image Source="{Binding sConfigurationImagePath}" Height="40" Margin="0,-6,0,0" Stretch="Uniform"/>
Style="{StaticResource ConfigProgram_ToggleButton}">
<Image Source="{Binding sConfigurationImagePath}"
Style="{StaticResource ConfigProgram_Image}"/>
</RadioButton>
<OPTIMIZER:UserAdminV Grid.Column="5"/>
EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml
-3
View File
@@ -7,9 +7,6 @@
ShowInTaskbar="True"
Drop="MainWindowV_Drop"
Title="{Binding Title}">
<!--<Window.OpacityMask>
<SolidColorBrush Color="White" Opacity="{Binding Window_Opacity}"/>
</Window.OpacityMask>-->
<EgtBEAMWALLCORE:OptimizerWindow.TitlePanel>
<OPTIMIZER:MainMenuV DataContext="{StaticResource MainMenuVM}"/>
</EgtBEAMWALLCORE:OptimizerWindow.TitlePanel>
EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
+12 -10
View File
@@ -9,7 +9,7 @@
Title="MovePartInRawPartWndV"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -31,20 +31,23 @@
Text="{Binding MoveDirMsg}"
Style="{StaticResource MoveDir_TextBlock}"/>
<RadioButton Grid.Row="1" Grid.Column="0"
<RadioButton Grid.Row="1"
IsChecked="{Binding LeftIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/MovePartInRawPart/MoveLeftParts.png" Stretch="Uniform"/>
<Image Source="/Resources/MovePartInRawPart/MoveLeftParts.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</RadioButton>
<RadioButton Grid.Row="1" Grid.Column="1"
<RadioButton Grid.Row="1"
Grid.Column="1"
IsChecked="{Binding RightIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/MovePartInRawPart/MoveRightParts.png" Stretch="Uniform"/>
<Image Source="/Resources/MovePartInRawPart/MoveRightParts.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</RadioButton>
</Grid>
<Grid Grid.Row="1"
Margin="5,5,5,0">
Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -59,18 +62,17 @@
<UniformGrid Grid.Row="3"
Columns="2"
Margin="5,5,5,0">
Style="{StaticResource Command_UniformGrid}">
<Button Grid.Column="1"
Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Margin="0,0,5,0"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource MovePartInRawPartWnd_Button}"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</UniformGrid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndV.xaml
+33 -32
View File
@@ -8,38 +8,39 @@
WindowStyle="None"
Title="MultiCopyRawPart"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ChooseQty_Msg}"
Grid.Row="0"
Margin="0,0,0,5"/>
<EgtWPFLib5:EgtTextBox Text="{Binding nQuantity}"
Grid.Row="1"
Margin="0,0,0,5"/>
<Grid Grid.Row="2" Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding Ok_Msg}"
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
</Grid>
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
</Grid>
<TextBlock Text="{Binding ChooseQty_Msg}"
Style="{StaticResource MultiCopyRawPartWnd_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Text="{Binding nQuantity}"
Style="{StaticResource MultiCopyRawPartWnd_TextBox}"/>
<Grid Grid.Row="2"
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="1"
Content="{Binding Ok_Msg}"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="{Binding Cancel_Msg}"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("2.7.11.5")>
<Assembly: AssemblyFileVersion("2.7.11.5")>
<Assembly: AssemblyVersion("2.7.11.6")>
<Assembly: AssemblyFileVersion("2.7.11.6")>
EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndV.xaml
+2 -2
View File
@@ -30,10 +30,10 @@
Style="{StaticResource NestingRunningWndV_TextBlock}"/>
<ProgressBar Grid.Row="4"
Value="{Binding CurrProgress_Value}"
Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
<ProgressBar Grid.Row="6"
Value="{Binding TotProgress_Value}"
Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
<TextBlock Grid.Row="8"
Text="{Binding TotProgress_Msg}"
Style="{StaticResource NestingRunningWndV_TextBlock}"/>
EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
+2 -1
View File
@@ -11,7 +11,8 @@
<Button ToolTip="{Binding Warehouse_ToolTip}"
Command="{Binding Warehouse_Command}"
Style="{StaticResource Warehouse_Button}">
<Image Source="/Resources/OptimizePanel/Warehouse.png" Stretch="Uniform"/>
<Image Source="/Resources/OptimizePanel/Warehouse.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/PartManager/PartManagerV.xaml
+24 -16
View File
@@ -15,42 +15,50 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{StaticResource Optimizer_Border}"/>
<StackPanel Margin="10,5,10,5" Orientation="Horizontal">
<TextBlock Text="W" Margin="0,0,5,0"
Style="{StaticResource PartManager_TextBlock}"/>
<Border Grid.RowSpan="2"
Grid.ColumnSpan="3"
Style="{StaticResource Optimizer_Border}"/>
<StackPanel Style="{StaticResource PartManagers_StackPanel}">
<TextBlock Text="W"
Style="{StaticResource W_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sW,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
UpdateSourceTrigger=Explicit}"
Style="{StaticResource Dimension_TextBox}"/>
</StackPanel>
<StackPanel Grid.Column="1" Margin="10,5,10,5" Orientation="Horizontal">
<TextBlock Text="H" Margin="0,0,5,0"
Style="{StaticResource PartManager_TextBlock}"/>
<StackPanel Grid.Column="1"
Style="{StaticResource PartManagers_StackPanel}">
<TextBlock Text="H"
Style="{StaticResource W_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sH,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
UpdateSourceTrigger=Explicit}"
Style="{StaticResource Dimension_TextBox}"/>
</StackPanel>
<StackPanel Grid.Column="2" Margin="10,5,15,5" Orientation="Horizontal">
<TextBlock Text="L" Margin="0,0,5,0"
Style="{StaticResource PartManager_TextBlock}"/>
<StackPanel Grid.Column="2"
Style="{StaticResource PartManagerL_StackPanel}">
<TextBlock Text="L"
Style="{StaticResource W_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sL,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
UpdateSourceTrigger=Explicit}"
Style="{StaticResource Dimension_TextBox}"/>
</StackPanel>
<StackPanel Grid.Row="1" Margin="10,5,10,5" Orientation="Horizontal">
<TextBlock Text="BTL Qty" Margin="0,0,5,0"
Style="{StaticResource PartManager_TextBlock}"/>
<StackPanel Grid.Row="1"
Style="{StaticResource PartManagers_StackPanel}">
<TextBlock Text="BTL Qty"
Style="{StaticResource W_TextBlock}"/>
<TextBlock Text="{Binding Tag.sCNT,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
UpdateSourceTrigger=Explicit}"
Style="{StaticResource CNT_TextBlock}"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="10,5,10,5" Orientation="Horizontal">
<TextBlock Text="Added Qty" Margin="0,0,5,0"
Style="{StaticResource PartManager_TextBlock}"/>
<StackPanel Grid.Row="1"
Grid.Column="1"
Grid.ColumnSpan="2"
Style="{StaticResource PartManagers_StackPanel}">
<TextBlock Text="Added Qty"
Style="{StaticResource W_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sADDED,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartManagerV}},
UpdateSourceTrigger=Explicit}"
EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
+23 -21
View File
@@ -20,7 +20,8 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<UniformGrid Columns="2" Margin="0,0,0,-45">
<UniformGrid Columns="2"
Style="{StaticResource PartParametersWnd_UniformGrid}">
<TextBlock Text="{Binding NAM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
@@ -89,8 +90,9 @@
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
<GroupBox Grid.Row="1" Style="{DynamicResource GroupBoxStyle_NoHeader}" Margin="0,55">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="1"
Style="{DynamicResource PartParam_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -99,17 +101,14 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0"
Text="{Binding COLOUR_MSG}"
<TextBlock Text="{Binding COLOUR_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<Button Grid.Row="0"
Grid.Column="1"
<Button Grid.Column="1"
Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
Width="100"
Style="{StaticResource ToolBar_SmallButton}"/>
Style="{StaticResource PartParametersWnd_Button}"/>
<TextBlock Grid.Row="1"
Text="{Binding TRANSPARENCY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
@@ -121,7 +120,9 @@
</Grid>
</GroupBox>
<UniformGrid Grid.Column="1" Columns="2" Margin="0,0,0,-45">
<UniformGrid Grid.Column="1"
Columns="2"
Style="{StaticResource PartParameters_UniformGrid}">
<TextBlock Text="{Binding TIMBERGRADE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
@@ -202,8 +203,10 @@
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
<GroupBox Grid.Row="1" Grid.Column="1" Style="{DynamicResource GroupBoxStyle_NoHeader}" Margin="0,55">
<Grid Margin="0,5,0,0">
<GroupBox Grid.Row="1"
Grid.Column="1"
Style="{DynamicResource PartParam_GroupBox}">
<Grid Style="{StaticResource PartParameters_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -230,13 +233,12 @@
IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}},
Path=Tag.bREFSIDEALIGN,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
</Grid>
</GroupBox>
<Grid Grid.Row="0" Grid.Column="2" Grid.RowSpan="2">
<Grid Grid.Column="2" Grid.RowSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -257,7 +259,7 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<GroupBox Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<GroupBox Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource NoHeader_GroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -286,7 +288,7 @@
Margin="0,5"/>
</Grid>
</GroupBox>
<GroupBox Grid.Row="2" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<GroupBox Grid.Row="2" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource NoHeader_GroupBox}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -316,7 +318,7 @@
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Grid.Row="4" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<GroupBox Grid.Row="4" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource NoHeader_GroupBox}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -346,7 +348,7 @@
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Grid.Row="6" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<GroupBox Grid.Row="6" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource NoHeader_GroupBox}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -376,7 +378,7 @@
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Grid.Row="8" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<GroupBox Grid.Row="8" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource NoHeader_GroupBox}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -411,7 +413,7 @@
Style="{StaticResource PartParam_ComboBox}"/>
</Grid>
</GroupBox>
<GroupBox Grid.Row="10" Grid.RowSpan="4" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<GroupBox Grid.Row="10" Grid.RowSpan="4" Grid.ColumnSpan="2" Style="{DynamicResource NoHeader_GroupBox}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
EgtBEAMWALL.Optimizer/PdfViewer/PdfViewer.xaml
+1 -8
View File
@@ -2,14 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ScrollViewer PanningMode="Both">
<ScrollViewer.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="#CCCCCC" Offset="0"/>
<GradientStop Color="#D9D9D9" Offset="0.45"/>
<GradientStop Color="#E6E6E6" Offset="1"/>
</LinearGradientBrush>
</ScrollViewer.Background>
<ScrollViewer Style="{StaticResource PDFViewer_ScrollViewer}">
<ItemsControl x:Name="PagesContainer"/>
</ScrollViewer>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
+31 -27
View File
@@ -6,20 +6,20 @@
<!--Barra superiore dei comandi-->
<Button Command="{Binding ShowPopUpStartBtnCommand}"
Name="StartBtn" Margin="0,0,2.5,0"
Style="{StaticResource ProdManagerNew_Button}">
<Image Source="/Resources/NewPage/play.png" Stretch="Uniform"/>
Name="StartBtn"
Style="{StaticResource ProdManagerPopUp_Button}">
<Image Source="/Resources/NewPage/play.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Popup IsOpen="{Binding IsStartBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=StartBtn}">
PlacementTarget="{Binding ElementName=StartBtn}"
Style="{StaticResource Filter_PopUp}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding New_Command}"
ToolTip="{Binding NewToolTip}"
Style="{StaticResource ProdManagerNew_Button}">
<Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/New.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding OpenCommand}"
ToolTip="{Binding OpenToolTip}"
@@ -32,46 +32,50 @@
<Style TargetType="{x:Type MenuItem}">
<Setter Property="Command"
Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
<Setter Property="CommandParameter" Value="{Binding}" />
<Setter Property="CommandParameter" Value="{Binding}"/>
</Style>
</ContextMenu.Resources>
</ContextMenu>
</Button.ContextMenu>
<Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/Open.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ImportBTL_Command}"
ToolTip="{Binding ImportBTL_ToolTip}"
Style="{StaticResource ProdManager_Button}">
<Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/ImportBTL.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ImportProject_Command}"
ToolTip="{Binding ImportProject_ToolTip}"
Style="{StaticResource ProdManager_Button}">
<Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/ImportProject.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Popup>
<Button Command="{Binding ShowPopUpSaveBtnCommand}"
Name="SaveBtn" Margin="0,0,2.5,0"
Style="{StaticResource ProdManagerNew_Button}">
<Image Source="/Resources/NewPage/diskette.png" Stretch="Uniform"/>
Name="SaveBtn"
Style="{StaticResource ProdManagerPopUp_Button}">
<Image Source="/Resources/NewPage/diskette.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Popup IsOpen="{Binding IsSaveBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=SaveBtn}">
PlacementTarget="{Binding ElementName=SaveBtn}"
Style="{StaticResource Filter_PopUp}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Style="{StaticResource ProdManager_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/Save.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ExportProject_Command}"
ToolTip="{Binding ExportProject_ToolTip}"
Style="{StaticResource ProdManager_Button}">
<Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/ExportProject.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Popup>
@@ -79,19 +83,19 @@
<Button Command="{Binding ShowPopUpBtlBtnCommand}"
Name="BtlBtn"
Style="{StaticResource ProdManagerNew_Button}">
<Image Source="/Resources/NewPage/add.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/add.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Popup IsOpen="{Binding IsBtlBtnOpen}"
AllowsTransparency="True"
PopupAnimation="Scroll"
StaysOpen="False"
PlacementTarget="{Binding ElementName=BtlBtn}">
PlacementTarget="{Binding ElementName=BtlBtn}"
Style="{StaticResource Filter_PopUp}">
<StackPanel Orientation="Vertical">
<Button Command="{Binding AddProj_Command}"
ToolTip="{Binding AddProj_ToolTip}"
Visibility="{Binding AddProj_Visibility}"
Style="{StaticResource ProdManager_Button}">
<Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
<Image Source="/Resources/ProjectManager/AddProj.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Popup>
EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
+66 -51
View File
@@ -16,7 +16,7 @@
<RowDefinition Height="{Binding GridDims[2].GridLen, Mode=TwoWay}"/>
</Grid.RowDefinitions>
<Grid Grid.ColumnSpan="3"
Margin="2.5">
Style="{StaticResource Project_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -40,15 +40,16 @@
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
<Button Grid.Column="4"
HorizontalAlignment="Right"
Command="{Binding Optimizer_Command}"
ToolTip="{Binding Statistics_Msg}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/InstrumentPanel/Statistics.png" Stretch="Uniform"/>
Style="{StaticResource Optmizer_Button}">
<Image Source="/Resources/InstrumentPanel/Statistics.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
<Grid Grid.Row="1" Margin="2,0,0,0">
<Grid Grid.Row="1"
Style="{StaticResource Left_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -70,10 +71,9 @@
<TabControl Grid.Row="1"
Grid.Column="2"
BorderThickness="0"
Margin="0,-3.8,0,-2"
SelectedIndex="{Binding SelManagerTab}"
Visibility="{Binding DataContext.ManagerTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}">
Visibility="{Binding DataContext.ManagerTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Style="{StaticResource Project_TabControl}">
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
<Setter Property="Visibility" Value="Collapsed"/>
@@ -108,12 +108,16 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Grid.RowSpan="3" Grid.ColumnSpan="3" Style="{StaticResource Optimizer_Border}"/>
<Border Grid.RowSpan="3"
Grid.ColumnSpan="3"
Style="{StaticResource Optimizer_Border}"/>
<OPTIMIZER:PartManagerV Grid.Row="1" DataContext="{StaticResource PartManagerVM}"
<OPTIMIZER:PartManagerV Grid.Row="1"
DataContext="{StaticResource PartManagerVM}"
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
<Grid Grid.Row="2" Margin="5,5,0,5">
<Grid Grid.Row="2"
Style="{StaticResource FeatureManager_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
@@ -122,25 +126,31 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<ComboBox ItemsSource="{Binding StrategySetupList}"
Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="0,0,0,15"
<ComboBox Grid.ColumnSpan="2"
ItemsSource="{Binding StrategySetupList}"
SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource Strategy_ComboBox}" />
<OPTIMIZER:ProjectParametersV Grid.Row="1" Tag="{Binding GeneralParametersList}"
Style="{StaticResource StrategySetup_ComboBox}"/>
<OPTIMIZER:ProjectParametersV Grid.Row="1"
Tag="{Binding GeneralParametersList}"
IsEnabled="{Binding GeneralParametersIsEnable}"/>
<UniformGrid Rows="2" Grid.Row="1" Grid.Column="1" Margin="0,0,5,0">
<UniformGrid Grid.Row="1"
Grid.Column="1"
Rows="2"
Style="{StaticResource BTLDataWnd_UniformGrid}">
<CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
Margin="5,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
<Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="0,0,0,5"
Style="{StaticResource Project_CheckBox}"/>
<Button Command="{Binding Ok_Command}"
ToolTip="{Binding SaveAsToolTip}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
Style="{StaticResource SaveAs_Button}">
<Image Source="/Resources/NewPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</UniformGrid>
</Grid>
<Border Grid.ColumnSpan="2" Margin="10,5,10,5" Background="{StaticResource BeamWall_Glacier}" Style="{StaticResource Optimizer_Border}">
<Border Grid.ColumnSpan="2"
Background="{StaticResource BeamWall_Glacier}"
Style="{StaticResource Project_Border}">
<TextBlock Grid.ColumnSpan="2"
Text="{Binding BTLStructureVM.SelBTLPart.sNAM}"
VerticalAlignment="Center"
@@ -150,22 +160,24 @@
<Button Grid.Column="2"
Command="{Binding Parameter_Command}"
ToolTip="{Binding Parameters_ToolTip}" Margin="10"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
ToolTip="{Binding Parameters_ToolTip}"
Style="{StaticResource Parameter_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Image Grid.RowSpan="3"
Grid.Column="1" Margin="5"
Source="/Resources/NewPage/pezzo.png" Stretch="Uniform"/>
Grid.Column="1"
Source="/Resources/NewPage/pezzo.png"
Style="{StaticResource Piece_Image}"/>
<Button Grid.Row="2"
Grid.Column="3"
VerticalAlignment="Bottom" Margin="10"
Command="{Binding Back_Command}"
ToolTip="{Binding Back_Msg}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/NewPage/MoveLeft.png" Stretch="Uniform"/>
Style="{StaticResource Back_Button}">
<Image Source="/Resources/NewPage/MoveLeft.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</Grid>
</TabItem.Content>
@@ -183,7 +195,9 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource Optimizer_Border}"/>
<Border Grid.RowSpan="2"
Grid.ColumnSpan="2"
Style="{StaticResource Optimizer_Border}"/>
<OPTIMIZER:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
@@ -206,17 +220,17 @@
Visibility="{Binding DataContext.SceneShowBuldingVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
<GridSplitter Grid.Row="2"
Grid.ColumnSpan="3" Height="10"
Style="{StaticResource Height_GridSplitter}"/>
Grid.ColumnSpan="3"
Style="{StaticResource HeightBottom_GridSplitter}"/>
<Grid Grid.Row="3"
Grid.Column="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TabControl BorderThickness="0"
Margin="0,-4,0,-2"
SelectedIndex="{Binding SelFeatureManagerTab}" Grid.RowSpan="2">
<TabControl Grid.RowSpan="2"
SelectedIndex="{Binding SelFeatureManagerTab}"
Style="{StaticResource Feature_TabControl}">
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
<Setter Property="Visibility" Value="Collapsed"/>
@@ -230,24 +244,23 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="3" Style="{StaticResource Optimizer_Border}"
<Border Grid.ColumnSpan="3"
Style="{StaticResource Optimizer_Border}"
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
<OPTIMIZER:FeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}" Margin="5"
Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
<StackPanel Orientation="Vertical"
Grid.Column="1"
Width="250" >
<StackPanel Grid.Column="1"
Style="{StaticResource Message_StackPanel}">
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Margin="5,0,5,0"
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Style="{StaticResource Message_TextBlock}"/>
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Margin="5,0,5,0"
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Style="{StaticResource Message_TextBlock}"/>
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Margin="5,0,5,0"
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
Style="{StaticResource Message_TextBlock}"/>
</StackPanel>
</Grid>
</TabItem>
@@ -259,17 +272,19 @@
</TabControl>
</Grid>
<Grid Grid.Row="3" Margin="2,0,0,0">
<Grid Grid.Row="3"
Style="{StaticResource Left_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="2" Style="{StaticResource Optimizer_Border}"/>
<Border Grid.ColumnSpan="2"
Style="{StaticResource Optimizer_Border}"/>
<WrapPanel Grid.Column="1" Margin="0,2,2,0"
<WrapPanel Grid.Column="1"
Width="{Binding ActualWidth, ElementName=TOPTRAY}"
Style="{StaticResource Project_WrapPanel}">
Style="{StaticResource Bottom_WrapPanel}">
<OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
<OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
<OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndV.xaml
+12 -15
View File
@@ -9,18 +9,17 @@
Title="ProjectType"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<StackPanel Margin="5,5,5,0">
<StackPanel Style="{StaticResource AddSectionXMaterialWnd_StackPanel}">
<Border Grid.Row="1"
Style="{StaticResource ProjectTypeWndV_Border}">
<Grid Margin="5">
<Grid Style="{StaticResource BlockedWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0"
Style="{StaticResource ProjectType_Grid}">
<Grid Style="{StaticResource ProjectType_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
@@ -29,12 +28,11 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0"
Grid.ColumnSpan="2"
<TextBlock Grid.ColumnSpan="2"
Text="{Binding ChooseMachine_Msg}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<Rectangle Grid.Row="1"
Height="22"/>
Style="{StaticResource ProjectType_Rectangle}"/>
<ComboBox Grid.Row="2"
ItemsSource="{Binding MachineList}"
DisplayMemberPath="Name"
@@ -54,12 +52,11 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0"
Grid.ColumnSpan="2"
<TextBlock Grid.ColumnSpan="2"
Text="{Binding ChooseType_Msg}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<Rectangle Grid.Row="1"
Height="22"/>
Style="{StaticResource ProjectType_Rectangle}"/>
<ComboBox Grid.Row="2"
ItemsSource="{Binding TypeList}"
SelectedItem="{Binding nSelType}"
@@ -67,7 +64,7 @@
</Grid>
<Grid Grid.Row="2"
Margin="5">
Style="{StaticResource BlockedWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -79,11 +76,11 @@
Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</Grid>
EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
+13 -8
View File
@@ -10,9 +10,9 @@
<Button Command="{Binding NewRawPart_Command}"
ToolTip="{Binding NewRawPart_ToolTip}"
IsEnabled="{Binding BTLPartManager_IsEnabled}"
Margin="5,1,0,1"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
Style="{StaticResource RawPartManager_Button}">
<Image Source="/Resources/LeftPanel/NewRawPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<StackPanel Grid.Column="1"
Style="{StaticResource RawPartManager_StackPanel}">
@@ -21,32 +21,37 @@
IsEnabled="{Binding RawPartManagerIsEnabled}"
Visibility="{Binding ProduceRawPart_Visibility}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/TopPanel/ProduceAllRawPart.png" Stretch="Uniform"/>
<Image Source="/Resources/TopPanel/ProduceAllRawPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding VerifyAll_ToolTip}"
Command="{Binding VerifyAll_Command}"
IsEnabled="{Binding VerifyAll_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/VerifyAll.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding ResetCalc_Command}"
ToolTip="{Binding ResetCalc_ToolTip}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
<Image Source="/Resources/CALCPanel/ResetCalc.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding RemoveAllRawPart_Command}"
ToolTip="{Binding RemoveAllRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Remove.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding MovePartInRawPart_Command}"
ToolTip="{Binding MovePartInRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Visibility="{Binding MovePartInRawPart_Visibility}"
Style="{StaticResource LP_Button}">
<Image Source="/Resources/TopPanel/MovePartInRawPart.png" Stretch="Uniform"/>
<Image Source="/Resources/TopPanel/MovePartInRawPart.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerWndV.xaml
+4 -9
View File
@@ -1,21 +1,16 @@
<Grid x:Class="RawPartManagerWndV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
</LinearGradientBrush>
</Grid.Background>
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
Style="{StaticResource RawPartManagerWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.RowSpan="2" Style="{StaticResource Optimizer_Border}"/>
<Border Grid.RowSpan="2"
Style="{StaticResource Optimizer_Border}"/>
<OPTIMIZER:RawPartManagerV/>
EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
+11 -11
View File
@@ -11,7 +11,7 @@
Title="SaveAsStrategy"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid HorizontalAlignment="Center">
<Grid Style="{StaticResource FeatureInPartInRawPartList_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
@@ -25,10 +25,9 @@
Style="{StaticResource Strategy_ListBox}">
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:StrategySetup}">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="•"
Margin="0,0,5,0"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource Pointer_TextBlock}"/>
<TextBlock Text="{Binding sName}"
Style="{StaticResource DialogWindow_TextBlock}"/>
</StackPanel>
@@ -36,14 +35,13 @@
</ListBox.ItemTemplate>
</ListBox>
<Grid Grid.Row="1"
Margin="5,0,5,10">
Style="{StaticResource SaveAsStrategy_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBox Text="{Binding sFileNameCustomConfig, UpdateSourceTrigger=PropertyChanged}"
IsReadOnly="False"
Style="{StaticResource Strategy_TextBox}"/>
Style="{StaticResource SaveAsStrategy_TextBox}"/>
<UniformGrid Grid.Column="2"
Columns="3">
<Button Command="{Binding SaveAsCommand}"
@@ -51,26 +49,28 @@
IsEnabled="{Binding bSaveAsIsEnable}"
Visibility="{Binding bOpen_Visibility}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/newPage/Ok.png" Stretch="Uniform"/>
<Image Source="/Resources/newPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding SaveAsCommand}"
ToolTip="{Binding SaveAsToolTip}"
IsEnabled="{Binding bSaveAsIsEnable}"
Visibility="{Binding bSave_Visibility}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/newPage/Ok.png" Stretch="Uniform"/>
<Image Source="/Resources/newPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding CloseCommand}"
ToolTip="{Binding SaveAsToolTip}"
Style="{StaticResource SaveStrategy_Button}">
<Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</UniformGrid>
</Grid>
<TextBlock Grid.Row="2"
Text="{Binding sErrorMsg}"
Visibility="{Binding ErrorMsgVisibility}"
Margin="0,0,0,10"
Style="{StaticResource ErrorMsg_TextBlock}"/>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/SceneShowBulding/SceneBuildingV.xaml
+5 -6
View File
@@ -13,8 +13,7 @@
</Grid.ColumnDefinitions>
<ItemsControl Grid.ColumnSpan="2"
ItemsSource="{Binding ButtonBuildingList}"
Margin="0,5,5,5"
Style="{StaticResource ExpanderElementList_ItemsControl}">
Style="{StaticResource SceneBuilding_ItemsControl}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/>
@@ -24,15 +23,15 @@
<DataTemplate>
<Button Content="{Binding sNameBTL}"
Command="{Binding ChangeSceneCommand}"
Width="Auto" Height="30" Margin="0,0,5,0"
Style="{StaticResource OnlyProd_Button}"/>
Style="{StaticResource NameBTL_Button}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<WrapPanel Grid.Row="1" Grid.Column="1" Margin="0,2,2,0"
<WrapPanel Grid.Row="1"
Grid.Column="1"
Width="{Binding ActualWidth, ElementName=TOPTRAY}"
Style="{StaticResource Project_WrapPanel}">
Style="{StaticResource Bottom_WrapPanel}">
<OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelShowBuildingVM}"/>
</WrapPanel>
EgtBEAMWALL.Optimizer/SetUp/SetUpV.xaml
+44 -44
View File
@@ -16,40 +16,50 @@
<TreeView.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}">
<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
<EventSetter Event="MouseDoubleClick" Handler="TreeViewItem_MouseDoubleClick"/>
</Style>
</TreeView.ItemContainerStyle>
<TreeView.Resources>
<HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolItem}" ItemsSource="{Binding Items}">
<HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolItem}"
ItemsSource="{Binding Items}">
<Grid Height="20">
<Grid Style="{StaticResource SetUp_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
<TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
<Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
<Image Source="{Binding PictureString}"
Style="{StaticResource SetUp_Image}"/>
<TextBlock Grid.Column="1"
Text="{Binding Name}"
Style="{StaticResource SetUp_TextBlock}"/>
<Ellipse Grid.Column="2"
Fill="{Binding FamilyColor}"
Style="{StaticResource SetUp_Ellipse}"/>
</Grid>
</HierarchicalDataTemplate>
<DataTemplate DataType="{x:Type EgtWPFLib5:ToolItem}">
<Grid Height="20" ToolTip="{Binding ToolTipMsg}">
<Grid ToolTip="{Binding ToolTipMsg}"
Style="{StaticResource SetUp_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
<Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
<TextBlock Grid.Column="1"
Text="{Binding Name}"
Style="{StaticResource SetUp_TextBlock}"/>
<Ellipse Grid.Column="2"
Fill="{Binding ToolColor}"
Style="{StaticResource SetUp_Ellipse}"/>
</Grid>
</DataTemplate>
@@ -59,41 +69,44 @@
</TreeView>
<Grid Grid.Column="0" Margin="5,0,0,5">
<Grid Style="{StaticResource PositionGroup_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Image Source="{Binding SetUpImage}" MaxWidth="300"/>
<Image Source="{Binding SetUpImage}"
Style="{StaticResource PositionGroup_Image}"/>
<ItemsControl Grid.Column="1" ItemsSource="{Binding PositionGroupList}"
Style="{StaticResource HorizontalScrollViewerItemsControlStyle}">
<ItemsControl Grid.Column="1"
ItemsSource="{Binding PositionGroupList}"
Style="{StaticResource HorizontalScrollViewer_ItemsControl}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}" Margin="0,0,20,0">
<ItemsControl Grid.Column="1"
ItemsSource="{Binding PositionList}"
Style="{StaticResource SetUp_ItemsControl}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"/>
<WrapPanel Style="{StaticResource Project_WrapPanel}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="5,5,15,5">
<Grid Style="{StaticResource ExitTool_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding TcPos}"/>
<ItemsControl Grid.Column="1" ItemsSource="{Binding ExitToolAssociationList}"
HorizontalAlignment="Left">
<ItemsControl Grid.Column="1"
ItemsSource="{Binding ExitToolAssociationList}"
Style="{StaticResource ExitTool_ItemsControl}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="1"/>
@@ -101,50 +114,37 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="10,0,0,5">
<Grid Style="{StaticResource ExitPar_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<ToggleButton Content="{Binding ExitPar}" Name="ExitBtn"
<ToggleButton Content="{Binding ExitPar}"
Name="ExitBtn"
CommandParameter="{Binding SelectedItem,ElementName=ToolsTreeView}"
IsChecked="{Binding IsOccupied}" Height="25" Width="25" Margin="0,0,5,0"
IsChecked="{Binding IsOccupied}"
Command="{Binding SetUpToolCommand}"
IsEnabled="{Binding IsEnabledPos}"
Background="{Binding ExitBtnBackgroundCol}"
Style="{StaticResource EgtCAM5_SetUpToggleButton}"/>
<Border x:Name="ToolBorder" Grid.Column="1" BorderBrush="{StaticResource EgaltechBlue1}"
BorderThickness="1" ToolTip="{Binding ToolTipMsg}">
<Border.Style>
<Style TargetType="{x:Type Border}">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ExitBtn, Path=IsChecked}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
<Border Grid.Column="1"
x:Name="ToolBorder"
ToolTip="{Binding ToolTipMsg}"
Style="{StaticResource SetUp_Border}">
<TextBlock Text="{Binding Tool.Name}" Margin="3"/>
</Border>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</Grid>
</UserControl>
EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
+6 -3
View File
@@ -8,18 +8,21 @@
ToolTip="{Binding ShowAll_ToolTip}"
Visibility="{Binding ShowAll_Visibility}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ShowBeamPanel/ShowAll.png" Stretch="Uniform"/>
<Image Source="/Resources/ShowBeamPanel/ShowAll.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<ToggleButton IsChecked="{Binding ShowSolid_IsChecked}"
IsEnabled="{Binding ShowSolid_IsEnabled}"
ToolTip="{Binding ShowSolid_ToolTip}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowBeamPanel/ShowSolid.png" Stretch="Uniform"/>
<Image Source="/Resources/ShowBeamPanel/ShowSolid.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowBuilding_IsChecked}"
ToolTip="{Binding ShowBuilding_ToolTip}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowBeamPanel/ShowBuilding.png" Stretch="Uniform"/>
<Image Source="/Resources/ShowBeamPanel/ShowBuilding.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</ToggleButton>
</StackPanel>
EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
+6 -3
View File
@@ -6,17 +6,20 @@
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
IsChecked="{Binding WireframeIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
<Image Source="/Resources/ShowPanel/RenderingWF.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingHLToolTip}"
IsChecked="{Binding HiddenLineIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
<Image Source="/Resources/ShowPanel/RenderingHL.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingSHToolTip}"
IsChecked="{Binding ShadingIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
<Image Source="/Resources/ShowPanel/RenderingSH.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</RadioButton>
</StackPanel>
EgtBEAMWALL.Optimizer/SpecialPanel/SpecialPanelV.xaml
+1 -1
View File
@@ -6,7 +6,7 @@
<ItemsControl ItemsSource="{Binding ButtonList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
+1 -1
View File
@@ -12,7 +12,7 @@
<Grid>
<Image Source="/Resources/NewPage/LogoProvaStrategy.png"
Stretch="Uniform"/>
Style="{StaticResource BTLDataWnd_Image}"/>
<TextBlock x:Name="VersionTxBl"
Style="{StaticResource SplashScreenV_TextBlock}"/>
</Grid>
EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
+50 -39
View File
@@ -176,91 +176,102 @@
</TabControl>
<Grid Grid.Row="1" Background="{StaticResource BeamWall_Glacier}">
<Grid Grid.Row="1"
Style="{StaticResource Statistics_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<StackPanel Margin="10" Background="{StaticResource BeamWall_White}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding TotMachGroups_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource Statistics_StackPanel}">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding TotMachGroups_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotMachGroups,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding BTLTotVolume_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding BTLTotVolume_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotVolume,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding BTLTotEstimatedTime_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding BTLTotEstimatedTime_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding BTLTotTime_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding BTLTotTime_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotTime,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding BTLRemainingTime_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding BTLRemainingTime_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1" Margin="-10,10,10,10" Background="{StaticResource BeamWall_White}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding TotCNTParts_Msg}" Margin="10,5,5,5"/>
<StackPanel Grid.Column="1"
Style="{StaticResource OptStatistics_StackPanel}">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding TotCNTParts_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.BTLStructureVM.sTotCNTParts,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding TotADDEDParts_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding TotADDEDParts_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.BTLStructureVM.sTotADDEDParts,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding TotINPRODParts_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding TotINPRODParts_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.BTLStructureVM.sTotINPRODParts,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding TotDONEParts_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="{Binding TotDONEParts_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.BTLStructureVM.sTotDONEParts,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Vertical" Margin="-10,10,10,10" Background="{StaticResource BeamWall_White}">
<StackPanel Grid.Column="2"
Style="{StaticResource RawPart_StackPanel}">
<ToggleButton Content="R"
Grid.Column="2"
Foreground="{StaticResource BeamWall_White}"
IsChecked="{Binding bRawPart_IsChecked}"
ToolTip="Materials"
Style="{StaticResource ToolBar_ToggleButton}"
Margin="0,10,10,5">
Style="{StaticResource Statistics_ToggleButton}">
<!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
</ToggleButton>
<Button ToolTip="{Binding CopyToClipboard_Msg}"
x:Name="CopyToClipboardBtn"
Style="{StaticResource CopyToClipboard_ToolBar_Button}"
Margin="0,5,10,5">
<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
Style="{StaticResource Statistics_Button}">
<Image Source="/Resources/Statistics/CopyToClipboard.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding PrintPDF_Msg}"
Command="{Binding PrintOptPDF_Command}"
Style="{StaticResource CopyToClipboard_ToolBar_Button}"
Margin="0,5,10,5">
<Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
Style="{StaticResource Statistics_Button}">
<Image Source="/Resources/Statistics/PrintPDF.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
+27 -25
View File
@@ -16,28 +16,30 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<GroupBox Header="PDF Preview"
Style="{StaticResource GroupBox_PDFPreview}"
Foreground="{StaticResource BeamWall_Corduroy}">
Style="{StaticResource PDFPreview_GroupBox}">
<StackPanel Style="{StaticResource List_StackPanel}">
<Button ToolTip="PDF Viewer - Preview"
Command="{Binding CreatePreviewVis_Command}"
Style="{StaticResource PDFPanel_Button}">
<Image Source="/Resources/PDFEditor/PrintPDF.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/PrintPDF.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="PDF Viewer - Optimizer"
Command="{Binding CreatePreviewOtt_Command}"
Style="{StaticResource PDFPanel_Button}">
<Image Source="/Resources/PDFEditor/PrintPDF.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/PrintPDF.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="Close PDF Viewer"
Command="{Binding ClosePreview_Command}"
Style="{StaticResource Close_Button}">
<Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</GroupBox>
<ScrollViewer Grid.Row="1"
Style="{StaticResource OnlyProd_ScrollViewer}">
Style="{StaticResource PDF_ScrollViewer}">
<ItemsControl ItemsSource="{Binding ExpanderList}"
Style="{StaticResource ExpanderList_ItemsControl}">
<ItemsControl.ItemsPanel>
@@ -47,11 +49,10 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Expander Style="{StaticResource Expander_PDF}">
<Expander Style="{StaticResource PDF_Expander}">
<Expander.Header>
<TextBlock Text="{Binding sNameCategory}"
Style="{StaticResource Category_TextBlock}"
Foreground="{StaticResource BeamWall_White}"/>
Style="{StaticResource Category_TextBlock}"/>
</Expander.Header>
<ItemsControl ItemsSource="{Binding ExpanderElementList}"
Style="{StaticResource ExpanderElementList_ItemsControl}">
@@ -66,8 +67,7 @@
<CheckBox IsChecked="{Binding bParameter_IsChecked, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource Option_CheckBox}"/>
<TextBlock Text="{Binding sNameParameter}"
Style="{StaticResource OptionTextBlock}"
Foreground="{StaticResource BeamWall_Corduroy}"/>
Style="{StaticResource Option_TextBlock}"/>
</StackPanel>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:ExpanderTable}">
@@ -86,11 +86,11 @@
ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Style="{StaticResource List_StackPanel}" Margin="0,-0.5,0,5">
<StackPanel Style="{StaticResource PDFEditor_StackPanel}">
<CheckBox IsChecked="{Binding bIsChecked}"
Style="{StaticResource Option_CheckBox}"/>
<TextBlock Text="{Binding Name, Converter={StaticResource ColumnNameConverter}}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>
@@ -102,26 +102,26 @@
<CheckBox IsChecked="{Binding bSection_IsChecked}"
Style="{StaticResource Option_CheckBox}"/>
<TextBlock Text="{Binding Section_Msg}"
Style="{StaticResource OptionTextBlock}"
Foreground="{StaticResource BeamWall_Corduroy}"/>
Style="{StaticResource Option_TextBlock}"/>
</StackPanel>
<StackPanel Style="{StaticResource List_StackPanel}">
<CheckBox IsChecked="{Binding bImage_IsChecked}"
Style="{StaticResource Option_CheckBox}"/>
<TextBlock Text="{Binding Image_Msg}"
Style="{StaticResource OptionTextBlock}"
Foreground="{StaticResource BeamWall_Corduroy}"/>
Style="{StaticResource Option_TextBlock}"/>
</StackPanel>
</UniformGrid>
<StackPanel Grid.Column="1"
Style="{StaticResource Button_StackPanel}">
<Button Command="{Binding MoveUpOrder_Command}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/PDFEditor/MoveUp.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/MoveUp.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding MoveDownOrder_Command}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/PDFEditor/MoveDown.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/MoveDown.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
@@ -135,15 +135,17 @@
</ScrollViewer>
<GroupBox Grid.Column="1"
Grid.RowSpan="2"
Style="{StaticResource GroupBox_PDFPreview}"
Foreground="{StaticResource BeamWall_Corduroy}">
Style="{StaticResource PDFPreview_GroupBox}">
<GroupBox.Header>
<StackPanel Orientation="Horizontal">
<Image Source="/Resources/PDFEditor/PDFPreview.png" Height="20" Width="20" Stretch="Uniform"/>
<TextBlock Text="PDF" Margin="5,2,0,0"/>
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<Image Source="/Resources/PDFEditor/PDFPreview.png"
Style="{StaticResource PDF_Image}"/>
<TextBlock Text="PDF"
Style="{StaticResource PDF_TextBlock}"/>
</StackPanel>
</GroupBox.Header>
<OPTIMIZER:PdfViewer PdfPath="{Binding WebAddress}" Visibility="{Binding PdfViewer_Visibility}"/>
<OPTIMIZER:PdfViewer PdfPath="{Binding WebAddress}"
Visibility="{Binding PdfViewer_Visibility}"/>
</GroupBox>
</Grid>
EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
+27 -21
View File
@@ -144,49 +144,55 @@
</EgwWPFBaseLib:EgwDataGrid>
<Grid Grid.Row="1" Background="{StaticResource BeamWall_Glacier}">
<Grid Grid.Row="1"
Style="{StaticResource Statistics_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<StackPanel>
<StackPanel Orientation="Horizontal" Margin="10,10,0,0" Background="{StaticResource BeamWall_White}">
<TextBlock Text="{Binding BTLTotParts_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource BTLTotParts_StackPanel}">
<TextBlock Text="{Binding BTLTotParts_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.sBTLTotParts,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="10,-1,0,0" Background="{StaticResource BeamWall_White}">
<TextBlock Text="{Binding BTLTotVolume_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource BTLTotTime_StackPanel}">
<TextBlock Text="{Binding BTLTotVolume_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.sBTLTotVolume,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="10,-1,0,0" Background="{StaticResource BeamWall_White}">
<TextBlock Text="{Binding BTLTotTime_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource BTLTotTime_StackPanel}">
<TextBlock Text="{Binding BTLTotTime_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.sBTLTotTime,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="10,-1,0,10" Background="{StaticResource BeamWall_White}">
<TextBlock Text="{Binding BTLRemainingTime_Msg}" Margin="10,5,5,5"/>
<StackPanel Style="{StaticResource BTLRemainingTime_StackPanel}">
<TextBlock Text="{Binding BTLRemainingTime_Msg}"
Style="{StaticResource Statistics_TextBlock}"/>
<TextBlock Text="{Binding Tag.sBTLRemainingTime,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsV}}}"
Margin="10,5,5,5"/>
Style="{StaticResource Statistics_TextBlock}"/>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,10,10,10" Background="{StaticResource BeamWall_White}">
<StackPanel Grid.Column="1"
Style="{StaticResource CopyToClipBoard_StackPanel}">
<Button ToolTip="{Binding CopyToClipboard_Msg}"
x:Name="CopyToClipboardBtn"
Style="{StaticResource CopyToClipboard_ToolBar_Button}"
Margin="0,10,10,10">
<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
Style="{StaticResource CopyToClipboard_Button}">
<Image Source="/Resources/Statistics/CopyToClipboard.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding PrintPDF_Msg}"
Command="{Binding PrintPDF_Command}"
Style="{StaticResource CopyToClipboard_ToolBar_Button}"
Margin="0,10,10,10">
<Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
Command="{Binding PrintPDF_Command}"
Style="{StaticResource CopyToClipboard_Button}">
<Image Source="/Resources/Statistics/PrintPDF.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml
+2 -2
View File
@@ -12,9 +12,9 @@
Style="{StaticResource OptimizerWindow.Dialog}">
<TabControl Name="Statistic_TabControl"
BorderThickness="0"
SelectedIndex="0"
SelectionChanged="Statistic_TabControl_SelectionChanged">
SelectionChanged="Statistic_TabControl_SelectionChanged"
Style="{StaticResource SelTab_TabControl}">
<TabItem Header="STATISTICS">
<OPTIMIZER:StatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticWndV}}}"/>
</TabItem>
EgtBEAMWALL.Optimizer/StatusBar/StatusBarV.xaml
+9 -12
View File
@@ -1,7 +1,7 @@
<StatusBar x:Class="StatusBarV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Background="{StaticResource Omag_LightGray}">
Style="{StaticResource StatusBar_StatusBar}">
<StatusBar.ItemsPanel>
<ItemsPanelTemplate>
@@ -20,16 +20,17 @@
</StatusBar.ItemsPanel>
<!--Barra di caricamento-->
<StatusBarItem Grid.Column="0">
<StatusBarItem>
<ProgressBar Value="{Binding LoadingProgress}"
Height="20" Width="150"
Visibility="{Binding LoadingProgress_Visibility}"/>
Visibility="{Binding LoadingProgress_Visibility}"
Style="{StaticResource StatusBar_ProgressBar}"/>
</StatusBarItem>
<!--Bottone interruzione caricamento-->
<StatusBarItem Grid.Column="1">
<Button x:Name="StopLoadingBtn"
Command="{Binding StopProgress_Command}" Content="X"
Content="X"
Command="{Binding StopProgress_Command}"
IsEnabled="{Binding StopProgress_IsEnabled}"
Width="{Binding ActualHeight, ElementName=StopLoadingBtn}"
Visibility="{Binding StopProgress_IsVisible}"/>
@@ -50,23 +51,19 @@
<!--Indica la posizione del mouse quando è sulla scena-->
<StatusBarItem Grid.Column="4">
<TextBlock Text="{Binding CurrPos}"
TextAlignment="Right"
Foreground="{StaticResource Omag_Black}"
Width="250"/>
Style="{StaticResource StatusBar_TextBlock}"/>
</StatusBarItem>
<!--Indica l'unità di misura-->
<StatusBarItem Grid.Column="5">
<TextBlock Text="{Binding MeasureUnit}"
Foreground="{StaticResource Omag_Black}"
Width="35"/>
Style="{StaticResource Measure_TextBlock}"/>
</StatusBarItem>
<!--Indica la macchina corrente-->
<StatusBarItem Grid.Column="6">
<TextBlock Text="{Binding CurrMachine}"
Foreground="{StaticResource Omag_Black}"
Margin="0,0,5,0"/>
Style="{StaticResource CurrMachine_TextBlock}"/>
</StatusBarItem>
</StatusBar>
EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
+47 -76
View File
@@ -6,66 +6,54 @@
Margin="5,10,0,0">
<ItemsControl ItemsSource="{Binding Tag.ParameterList,
RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
Foreground="Black"
Margin="5,10,0,0"
Style="{StaticResource UsersControlStyle}">
Style="{StaticResource ParameterStrategy_ItemsControl}">
<ItemsControl.Resources>
<DataTemplate DataType="{x:Type OPTIMIZER:BooleanStrategyParameter}">
<UniformGrid Columns="2"
Margin="5,2,5,0"
Visibility="{Binding bBooleanVisibility}">
<UniformGrid Columns="2"
Visibility="{Binding bBooleanVisibility}"
Style="{StaticResource ParamStrategy_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ParamStrategy_TextBlock}"/>
<CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:DoubleStrategyParameter}">
<UniformGrid Columns="2"
Margin="5,2,5,0"
Visibility="{Binding bDoubleVisibility}">
<UniformGrid Columns="2"
Visibility="{Binding bDoubleVisibility}"
Style="{StaticResource ParamStrategy_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ParamStrategy_TextBlock}"/>
<TextBox Text="{Binding sValue}"
Style="{StaticResource ColorPicker_TextBox}"/>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:ComboStrategyParameter}">
<UniformGrid Columns="2"
Margin="5,2,5,0"
Visibility="{Binding bComboBoxVisibility}">
Visibility="{Binding bComboBoxVisibility}"
Style="{StaticResource ParamStrategy_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ParamStrategy_TextBlock}"/>
<ComboBox ItemsSource="{Binding ComboList}"
SelectedItem="{Binding SelValue}"
DisplayMemberPath="sValue"
Margin="0"
Foreground="Black"
Style="{StaticResource CalcPanel_ComboBox}">
Style="{StaticResource ProjectParameters_ComboBox}">
</ComboBox>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:StringStrategyParameter}">
<UniformGrid Columns="2"
Margin="5,2,5,0"
Visibility="{Binding bStringVisibility}">
Visibility="{Binding bStringVisibility}"
Style="{StaticResource ParamStrategy_UniformGrid}">
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource ParamStrategy_TextBlock}"/>
<TextBox Text="{Binding sValue}"
Style="{StaticResource ColorPicker_TextBox}"/>
</UniformGrid>
</DataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:ListStrategyParameter}">
<Grid Margin="5,5,5,0"
Visibility="{Binding bListBoxVisibility}">
<Grid Visibility="{Binding bListBoxVisibility}"
Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -75,39 +63,28 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding sDescriptionShort}"
HorizontalAlignment="Left"
VerticalAlignment="Top"
TextWrapping="WrapWithOverflow"
Style="{StaticResource DialogWindow_TextBlock}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="0,7,5,0" HorizontalAlignment="Right">
<Button VerticalAlignment="Top"
Width="50"
Margin="0,0,0,5"
ToolTip="{Binding OpenToolListToolTip}"
Style="{StaticResource ParamStrategyDescription_TextBlock}"/>
<StackPanel Grid.Column="1"
Style="{StaticResource PartManager_StackPanel}">
<StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
<Button ToolTip="{Binding OpenToolListToolTip}"
IsEnabled="{Binding OpenToolListIsEnable}"
Command="{Binding OpenToolListCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/NewPage/+.png" Stretch="Uniform"/>
Style="{StaticResource ProjectParameters_Button}">
<Image Source="/Resources/NewPage/+.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button VerticalAlignment="Top"
Width="50"
Margin="0"
ToolTip="{Binding DeselectAllToolTip}"
<Button ToolTip="{Binding DeselectAllToolTip}"
IsEnabled="{Binding ActiveToolListIsEnable}"
Command="{Binding DeselectAllCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/NewPage/deselectall.png" Stretch="Uniform"/>
Style="{StaticResource CloseProjectParameters_Button}">
<Image Source="/Resources/NewPage/deselectall.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
<Border Margin="2,0,2,0"
Style="{StaticResource Optimizer_Border}">
<Border Style="{StaticResource ForcedStrategyBTL_Border}">
<ItemsControl ItemsSource="{Binding ActiveToolList_View}"
BorderThickness="0"
Height="95"
Width="180"
Foreground="Black"
Style="{StaticResource UsersControlStyle}">
Style="{StaticResource ProjectParameters_ItemsControl}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Style="{StaticResource List_StackPanel}">
@@ -121,34 +98,28 @@
</ItemsControl>
</Border>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Visibility="{Binding AvailableToolListVisibility}">
<StackPanel Orientation="Vertical" Margin="0,7,5,0" HorizontalAlignment="Right">
<Button VerticalAlignment="Top"
Width="50"
Margin="0,0,0,5"
ToolTip="{Binding CloseToolListToolTip}"
<StackPanel Grid.Row="1"
Grid.Column="1"
Visibility="{Binding AvailableToolListVisibility}"
Style="{StaticResource PartManager_StackPanel}">
<StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
<Button ToolTip="{Binding CloseToolListToolTip}"
Command="{Binding CloseToolListCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
Style="{StaticResource ProjectParameters_Button}">
<Image Source="/Resources/PDFEditor/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button VerticalAlignment="Top"
Width="50"
Margin="0,0,0,5"
ToolTip="{Binding SelectAllToolTip}"
<Button ToolTip="{Binding SelectAllToolTip}"
IsEnabled="{Binding AvailableToolListIsEnable}"
Command="{Binding SelectAllCommand}"
Style="{StaticResource ParameterMachine_Button}">
<Image Source="/Resources/NewPage/selectall.png" Stretch="Uniform"/>
Style="{StaticResource ProjectParameters_Button}">
<Image Source="/Resources/NewPage/selectall.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
<Border Margin="2,5,2,0"
Style="{StaticResource Optimizer_Border}">
<Border Style="{StaticResource ProjectParamters_Border}">
<ItemsControl ItemsSource="{Binding AvailableToolList_View}"
BorderThickness="0"
Height="200"
Width="180"
Foreground="Black"
Style="{StaticResource UsersControlStyle}">
Style="{StaticResource AvailableToolList_ItemsControl}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Style="{StaticResource List_StackPanel}">
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
+39 -43
View File
@@ -17,19 +17,16 @@
</Grid.ColumnDefinitions>
<Button Command="{Binding ConfigurationParametersCommand}"
ToolTip="Parametri Configurazione"
Margin="10,0,10,0"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/NewPage/adjustment.png" Stretch="Uniform"/>
Style="{StaticResource ConfigurationParameters_Button}">
<Image Source="/Resources/NewPage/adjustment.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<StackPanel Grid.Column="1"
Orientation="Horizontal"
HorizontalAlignment="Center"
Margin="0,5,0,5">
Style="{StaticResource StrategyManager_StackPanel}">
<ComboBox ItemsSource="{Binding StrategyTypeList}"
SelectedItem="{Binding SelStrategyType}"
Visibility="{Binding StrategyType_Visibility}"
Style="{StaticResource Strategy_ComboBox}"
Margin="0,0,10,0"/>
Style="{StaticResource StrategyManager_ComboBox}"/>
<CheckBox IsChecked="{Binding DefaultConfig_IsChecked}"
Style="{StaticResource FreeContourInput_CheckBox}"/>
<ComboBox ItemsSource="{Binding StrategySetupList}"
@@ -38,20 +35,21 @@
Style="{StaticResource Strategy_ComboBox}"/>
<Button Command="{Binding New_Command}"
ToolTip="{Binding NewToolTip}"
Margin="10,0,10,0"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
Style="{StaticResource ConfigurationParameters_Button}">
<Image Source="/Resources/ProjectManager/New.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding OpenFileNameCustomConfigCommand}"
ToolTip="{Binding SaveAsToolTip}"
Margin="10,0,10,0"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/NewPage/+.png" Stretch="Uniform"/>
Style="{StaticResource ConfigurationParameters_Button}">
<Image Source="/Resources/NewPage/+.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="{Binding SaveImage}" Stretch="Uniform"/>
<Image Source="{Binding SaveImage}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
@@ -67,15 +65,11 @@
</Grid.ColumnDefinitions>
<Border Grid.RowSpan="2"
Margin="0,0,0,5"
Style="{StaticResource Optimizer_Border}">
Style="{StaticResource StrategyManager_Border}">
<TreeView Name="StrategyFeature_TreeView"
BorderThickness="0"
Width="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto"
Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Border}}}"
ItemsSource="{Binding SelStrategySetup.StrategyFeatureList}">
ItemsSource="{Binding SelStrategySetup.StrategyFeatureList}"
Style="{StaticResource StrategyManager_TreeView}">
<TreeView.Resources>
<HierarchicalDataTemplate DataType="{x:Type OPTIMIZER:StrategyFeature}"
ItemsSource="{Binding TopologyList}">
@@ -84,12 +78,18 @@
<ControlTemplate>
<Border Background="{Binding Background, RelativeSource={RelativeSource AncestorType={x:Type TreeView}}}">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<TextBlock Text="[" Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding nGrp}" Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="-" Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding nPrcDesc}" Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="]" Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding sName}" Style="{StaticResource DialogWindow_TextBlock}" Margin="5,0,0,0"/>
<TextBlock Text="["
Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding nGrp}"
Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="-"
Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding nPrcDesc}"
Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="]"
Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding sName}"
Style="{StaticResource StrategyManager_TextBlock}"/>
</StackPanel>
</Border>
</ControlTemplate>
@@ -97,7 +97,8 @@
</CheckBox>
</HierarchicalDataTemplate>
<DataTemplate DataType="{x:Type OPTIMIZER:Topology}">
<TextBlock Text="{Binding sName}" Style="{StaticResource DialogWindow_TextBlock}"/>
<TextBlock Text="{Binding sName}"
Style="{StaticResource DialogWindow_TextBlock}"/>
</DataTemplate>
</TreeView.Resources>
<TreeView.ItemContainerStyle>
@@ -122,24 +123,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<GroupBox Foreground="Black"
x:Name="GR"
BorderThickness="2"
Margin="0,-11,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}">
<GroupBox x:Name="GR"
Style="{StaticResource ProjectParameters_GroupBox}">
<GroupBox.Header>
<TextBlock Text="{Binding SelTreeItem.SelParamStrategy.sStrategyName}"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource StrategyName_TextBlock}"/>
</GroupBox.Header>
<OPTIMIZER:ParameterStrategyV Tag="{Binding SelTreeItem.SelParamStrategy}"/>
</GroupBox>
<Border Grid.Row="1"
Margin="2,2,2,0"
VerticalAlignment="Top"
<Border Grid.Row="1"
Height="{Binding ActualHeight, ElementName=GR}"
Style="{StaticResource Optimizer_Border}">
Style="{StaticResource Name_Border}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -150,9 +145,10 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding SelTreeItem.sName}"
FontWeight="Bold" Margin="0,10,0,0"
Style="{StaticResource DialogWindow_TextBlock}"/>
<Image Grid.Row="1" Source="{Binding SelTreeItem.sImage}" Stretch="Uniform" Margin="5,0,0,0"/>
Style="{StaticResource TreeItemName_TextBlock}"/>
<Image Grid.Row="1"
Source="{Binding SelTreeItem.sImage}"
Style="{StaticResource StrategyManager_Image}"/>
</Grid>
</Border>
</Grid>
EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
+15 -32
View File
@@ -2,13 +2,10 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
Foreground="Black"
BorderThickness="1"
BorderBrush="{StaticResource BeamWall_Glacier}">
Style="{StaticResource StrategyProduction_GroupBox}">
<GroupBox.Header>
<TextBlock Text="{Binding StrategyProductionPath, UpdateSourceTrigger=PropertyChanged}"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource StrategyName_TextBlock}"/>
</GroupBox.Header>
<Grid>
@@ -20,60 +17,46 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Margin="2,0,2,0"
Style="{StaticResource Optimizer_Border}">
<Border Style="{StaticResource ForcedStrategyBTL_Border}">
<ListBox ItemsSource="{Binding SelTreeItem.AvailableStrategyList}"
SelectedItem="{Binding SelTreeItem.SelAvailableStrategy}"
Width="Auto"
Height="Auto"
IsSynchronizedWithCurrentItem="False"
Style="{StaticResource NewAddFeature_ListBox}">
SelectedItem="{Binding SelTreeItem.SelAvailableStrategy}"
Style="{StaticResource AvailableStrategy_ListBox}">
<ListBox.Resources>
<DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<Image Source="{Binding sImageStrategy}"
Stretch="Uniform"
Width="100"
Height="100"/>
Style="{StaticResource StrategyProduction_Image}"/>
<TextBlock Text="{Binding sStrategyId}"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource DialogWindow_TextBlock}"/>
</StackPanel>
</DataTemplate>
</ListBox.Resources>
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<!--<EventSetter Event="PreviewMouseDown" Handler="AvailableStrategyList_PreviewMouseDown"/>-->
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
</Border>
<GroupBox Grid.Column="1"
Foreground="Black"
BorderThickness="2"
Margin="0,-10,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}">
Style="{StaticResource SelStrategyProduction_GroupBox}">
<GroupBox.Header>
<TextBlock Text="{Binding SelectedStrategyParamList.sStrategyId}"
FontWeight="Bold"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource StrategyName_TextBlock}"/>
</GroupBox.Header>
<OPTIMIZER:ParameterStrategyV/>
</GroupBox>
<StackPanel Grid.Row="2"
Grid.ColumnSpan="2"
HorizontalAlignment="Right"
Style="{StaticResource PartManager_StackPanel}">
Style="{StaticResource PParameters_StackPanel}">
<Button Command="{Binding Ok_Command}"
ToolTip="{Binding Ok_Msg}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/Ok.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding Cancel_Command}"
ToolTip="{Binding Cancel_Msg}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
<Image Source="/Resources/PDFEditor/Delete.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
+17 -23
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
Height="{Binding ActualHeight, ElementName=StrategyFeature_TreeView}"
VerticalAlignment="Top">
Style="{StaticResource Strategy_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -12,19 +12,15 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border Margin="2,0,2,0"
Style="{StaticResource Optimizer_Border}">
<Border Style="{StaticResource ForcedStrategyBTL_Border}">
<ListBox ItemsSource="{Binding SelTreeItem.AvailableStrategyList_View}"
SelectedItem="{Binding SelTreeItem.SelAvailableStrategy}"
IsSynchronizedWithCurrentItem="False"
Style="{StaticResource AvailableStrategy_ListBox}">
<ListBox.Resources>
<DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<Image Source="{Binding sStrategyImagePath}"
Stretch="Uniform"
Width="100"
Height="100"/>
Style="{StaticResource StrategyProduction_Image}"/>
<TextBlock Text="{Binding sStrategyName}"
Style="{StaticResource DialogWindow_TextBlock}"/>
</StackPanel>
@@ -39,32 +35,29 @@
</Border>
<StackPanel Grid.Column="1"
Orientation="Vertical"
VerticalAlignment="Center">
Style="{StaticResource Strategy_StackPanel}">
<Button Command="{Binding AddSelectedStrategyCommand}"
Style="{StaticResource Strategy_Button}">
<Image Source="/Resources/NewPage/MoveRight.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/MoveRight.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding RemoveSelectedStrategyCommand}"
Style="{StaticResource Strategy_Button}">
<Image Source="/Resources/NewPage/MoveLeft.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/MoveLeft.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
<Border Grid.Column="2"
Margin="2,0,2,0"
Style="{StaticResource Optimizer_Border}">
Style="{StaticResource ForcedStrategyBTL_Border}">
<ListBox ItemsSource="{Binding SelTreeItem.ActiveStrategyList_View}"
SelectedItem="{Binding SelTreeItem.SelActiveStrategy}"
IsSynchronizedWithCurrentItem="False"
Style="{StaticResource AvailableStrategy_ListBox}">
<ListBox.Resources>
<DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
<StackPanel Orientation="Horizontal">
<StackPanel Style="{StaticResource PartManager_StackPanel}">
<Image Source="{Binding sStrategyImagePath}"
Stretch="Uniform"
Width="100"
Height="100"/>
Style="{StaticResource StrategyProduction_Image}"/>
<TextBlock Text="{Binding sStrategyName}"
Style="{StaticResource DialogWindow_TextBlock}"/>
</StackPanel>
@@ -79,15 +72,16 @@
</Border>
<StackPanel Grid.Column="3"
Orientation="Vertical"
VerticalAlignment="Center">
Style="{StaticResource Strategy_StackPanel}">
<Button Command="{Binding MoveUpSelectedStrategyCommand}"
Style="{StaticResource Strategy_Button}">
<Image Source="/Resources/NewPage/MoveUp.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/MoveUp.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Command="{Binding MoveDownSelectedStrategyCommand}"
Style="{StaticResource Strategy_Button}">
<Image Source="/Resources/NewPage/MoveDown.png" Stretch="Uniform"/>
<Image Source="/Resources/NewPage/MoveDown.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
</Grid>
EgtBEAMWALL.Optimizer/StrategyManager/UserAdminV.xaml
+5 -12
View File
@@ -1,7 +1,7 @@
<Grid x:Class="UserAdminV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Background="{StaticResource BeamWall_Kashmir}">
Style="{StaticResource UserAdmin_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
@@ -9,26 +9,19 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding UserMsg}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Margin="5,0,5,0"
FontWeight="{Binding UserFontWeight}"
Foreground="{StaticResource BeamWall_White}"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource UserAdmin_TextBlock}"/>
<ToggleButton Grid.Column="1"
IsChecked="{Binding UserAdmin_IsChecked}"
Style="{StaticResource Parameter_ToggleButton}"/>
<TextBlock Grid.Column="2"
Text="{Binding AdvanceMsg}"
HorizontalAlignment="Left"
TextWrapping="WrapWithOverflow"
Margin="5,0,5,0"
FontWeight="{Binding AdminFontWeight}"
Foreground="{StaticResource BeamWall_White}"
Style="{StaticResource DialogWindow_TextBlock}"/>
Style="{StaticResource UserAdmin_TextBlock}"/>
<ToggleButton Grid.Column="3"
IsChecked="{Binding UnlockAllIsChecked}"
Style="{StaticResource Unlock_ToggleButton}">
<Image Source="{Binding UnloackImage}" Stretch="Uniform"/>
<Image Source="{Binding UnloackImage}"
Style="{StaticResource BTLDataWnd_Image}"/>
</ToggleButton>
</Grid>
EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml
+16 -20
View File
@@ -9,13 +9,11 @@
WindowStyle="None"
Title="UpdateBTLWnd"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<StackPanel Margin="5,5,5,0">
<StackPanel Style="{StaticResource List_StackPanel}">
<TextBlock Text="{Binding UpdateBTLWnd_Msg}"
TextWrapping="Wrap"
Width="400"
Margin="5"
Foreground="{StaticResource BeamWall_Corduroy}"/>
Style="{StaticResource UpdateBTL_TextBlock}"/>
<EgwWPFBaseLib:EgwDataGrid Width="400" MaxHeight="600"
ItemsSource="{Binding BTLPartList}"
@@ -54,11 +52,8 @@
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Ellipse Width="5"
Height="5"
Fill="Red"
Visibility="{Binding Overwrite_Visibility}"
HorizontalAlignment="Center"/>
<Ellipse Visibility="{Binding Overwrite_Visibility}"
Style="{StaticResource UpdateBTL_Ellipse}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -70,14 +65,15 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding Path=bInsert, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"/>
Style="{StaticResource Alias_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Resources>
</EgwWPFBaseLib:EgwDataGrid>
<Grid Grid.Row="2" Margin="0,0,0,5">
<Grid Grid.Row="2"
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -85,16 +81,16 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding Ok_Msg}"
<Button Grid.Column="1"
Content="{Binding Ok_Msg}"
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="{Binding Cancel_Msg}"
Command="{Binding Cancel_Command}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
IsCancel="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</StackPanel>
EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateOrAppendWndV.xaml
+18 -20
View File
@@ -7,7 +7,7 @@
WindowStyle="None"
Title="UpdateOrAppendWndV"
Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -15,8 +15,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid HorizontalAlignment="Center"
Margin="0,0,0,5">
<Grid Style="{StaticResource AddPart_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -26,20 +25,19 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<RadioButton Content="{Binding Update_Msg}"
<RadioButton Grid.Row="1"
Content="{Binding Update_Msg}"
IsChecked="{Binding UpdateIsChecked}"
Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"
Grid.Row="1" Grid.Column="0">
</RadioButton>
<RadioButton Content="{Binding Append_Msg}"
Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"/>
<RadioButton Grid.Row="1"
Grid.Column="1"
Content="{Binding Append_Msg}"
IsChecked="{Binding AppendIsChecked}"
Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"
Grid.Row="1" Grid.Column="1">
</RadioButton>
Style="{StaticResource UpdateOrAppendWnd_ToggleButton}"/>
</Grid>
<Grid Grid.Row="3"
Margin="0,0,0,5">
Style="{StaticResource AddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -48,15 +46,15 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="Ok"
<Button Grid.Column="1"
Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
IsDefault="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
<Button Grid.Column="3"
Content="{Binding Cancel_Msg}"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_Button}"/>
</Grid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>
EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+1287 -314
View File
File diff suppressed because it is too large Load Diff
EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
+14 -7
View File
@@ -6,38 +6,45 @@
<Button ToolTip="{Binding ZoomAllToolTip}"
Command="{Binding ZoomAllCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/ZoomAll.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding LookFromTopToolTip}"
Command="{Binding TopViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/LookFromTOP.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding LookFromFrontToolTip}"
Command="{Binding FrontViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/LookFromFRONT.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding LookFromRightToolTip}"
Command="{Binding RightViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding LookFromBackToolTip}"
Command="{Binding BackViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/LookFromBACK.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding LookFromLeftToolTip}"
Command="{Binding LeftViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/LookFromLEFT.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button ToolTip="{Binding LookFromIso_SWToolTip}"
Command="{Binding IsoViewSWCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
</StackPanel>
EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndV.xaml
+32 -52
View File
@@ -18,7 +18,7 @@
Name="WarehouseWndV"
Style="{StaticResource OptimizerWindow.Dialog}">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource AddRawPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
@@ -30,7 +30,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
@@ -43,12 +43,10 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0"
Text="{Binding CurrentS_Msg}"
<TextBlock Text="{Binding CurrentS_Msg}"
Visibility="{Binding Basic_Visibility}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox Grid.Row="0"
Grid.Column="1"
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=SParamList,
Mode=OneWay}"
SelectedItem="{Binding Path=SelCurrentS,
@@ -100,9 +98,8 @@
<GroupBox Grid.Row="3"
Grid.ColumnSpan="3"
Header="{Binding Offset_Msg}"
Foreground="{StaticResource BeamWall_Corduroy}"
Visibility="{Binding MediumWall_Visibility}"
Margin="0,0,0,5">
Style="{StaticResource Warehouse_GroupBox}">
<Grid Grid.Row="3"
Grid.ColumnSpan="3">
<Grid.ColumnDefinitions>
@@ -115,15 +112,13 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0"
Grid.Column="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0"
Text="{Binding MinThickness_Msg}"
<TextBlock Text="{Binding MinThickness_Msg}"
Style="{StaticResource NestingRunningWndV_TextBlock}"/>
<TextBlock Grid.Column="1"
Text="{Binding Value_Msg}"
@@ -142,9 +137,10 @@
Command="{Binding RemoveWhWallParam_Command}"
Style="{StaticResource WWnd_Button}"/>
<Grid Grid.Row="1"
Grid.Column="0">
<EgtWPFLib5:EgtScrollViewer Focusable="False" MaxHeight="200" VerticalScrollBarVisibility="Auto">
<Grid Grid.Row="1">
<EgtWPFLib5:EgtScrollViewer Focusable="False"
MaxHeight="200"
VerticalScrollBarVisibility="Auto">
<ItemsControl ItemsSource="{Binding WhWallParamList}">
<ItemsControl.ItemTemplate>
<DataTemplate>
@@ -154,8 +150,7 @@
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0"
Text="{Binding dMinThickness, Mode=OneWay}"
<TextBlock Text="{Binding dMinThickness, Mode=OneWay}"
Style="{StaticResource WarehouseWndV_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
@@ -173,24 +168,20 @@
</GroupBox>
</Grid>
<GroupBox Grid.Row="1"
Grid.Column="0"
<GroupBox Grid.Row="1"
Header="{Binding SParams_Msg}"
Foreground="{StaticResource BeamWall_Corduroy}"
Visibility="{Binding Basic_Visibility}"
Margin="0,0,0,5">
Style="{StaticResource Warehouse_GroupBox}">
<ListBox ItemsSource="{Binding SParamList}"
SelectedItem="{Binding SelSParam}"
DisplayMemberPath="sValue"
Style="{StaticResource WarehouseWndV_ListBox}"/>
</GroupBox>
<GroupBox Grid.Row="1"
Grid.Column="0"
<GroupBox Grid.Row="1"
Header="{Binding SParams_Msg}"
Foreground="{StaticResource BeamWall_Corduroy}"
Visibility="{Binding Medium_Visibility}"
Margin="0,0,0,5">
Style="{StaticResource Warehouse_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -230,7 +221,7 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bActive, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center"/>
Style="{StaticResource PParameters_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -302,25 +293,21 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Button Grid.Row="1"
Grid.Column="0"
Content="+"
Command="{Binding AddParam_Command}"
Style="{StaticResource WarehouseWndV_Button}">
</Button>
Style="{StaticResource WarehouseWndV_Button}"/>
<Button Grid.Row="1"
Grid.Column="1"
Content="-"
Command="{Binding RemoveParam_Command}"
Style="{StaticResource WarehouseWndV_Button}">
</Button>
Style="{StaticResource WarehouseWndV_Button}"/>
</Grid>
<GroupBox Grid.Row="3"
Header="{Binding NewParam_Msg}"
Foreground="{StaticResource BeamWall_Corduroy}"
Visibility="{Binding NewBeamParam_Visibility}"
Margin="0,0,0,5">
Style="{StaticResource Warehouse_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
@@ -341,25 +328,22 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0"
Content="{Binding OkAddParam_Msg}"
<Button Content="{Binding OkAddParam_Msg}"
Command="{Binding OkAddParam_Command}"
Style="{StaticResource OKAddParam_Button}">
</Button>
Style="{StaticResource OKAddParam_Button}"/>
<Button Grid.Column="1"
Content="{Binding Cancel_Msg}"
Command="{Binding CancelAddParam_Command}"
Style="{StaticResource CancelAddParam_Button}">
</Button>
Style="{StaticResource ProdManager_Button}"/>
</Grid>
</Grid>
</GroupBox>
<GroupBox Grid.Row="3"
Header="{Binding NewParam_Msg}"
Foreground="{StaticResource BeamWall_Corduroy}"
Visibility="{Binding NewWallParam_Visibility}"
Margin="0,0,0,5">
Style="{StaticResource Warehouse_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
@@ -392,14 +376,13 @@
<Button Grid.Column="0"
Content="{Binding OkAddParam_Msg}"
Command="{Binding OkAddParam_Command}"
Style="{StaticResource OKAddParam_Button}">
</Button>
Style="{StaticResource OKAddParam_Button}"/>
<Button Grid.Column="1"
Grid.ColumnSpan="2"
Content="{Binding Cancel_Msg}"
Command="{Binding CancelAddParam_Command}"
Style="{StaticResource CancelAddParam_Button}">
</Button>
Style="{StaticResource ProdManager_Button}"/>
</Grid>
</Grid>
</GroupBox>
@@ -410,18 +393,15 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0"
Content="{Binding Save_Msg}"
<Button Content="{Binding Save_Msg}"
Command="{Binding Save_Command}"
Style="{StaticResource OKAddParam_Button}">
</Button>
Style="{StaticResource OKAddParam_Button}"/>
<Button Grid.Column="1"
Content="{Binding Cancel_Msg}"
Command="{Binding Cancel_Command}"
Style="{StaticResource CancelAddParam_Button}">
</Button>
Style="{StaticResource ProdManager_Button}"/>
</Grid>
</Grid>
</EgtBEAMWALLCORE:OptimizerWindow>