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

- ripristinato grafica versione vecchia programma

Browse Source
This commit is contained in:
Demetrio Cassarino
2024-05-21 17:01:54 +02:00
parent c1986982ec
commit a1b5053ca1
47 changed files with 1724 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml
+6 -3
View File
@@ -18,7 +18,8 @@
<UniformGrid Rows="2" Margin="3,3,3,3">
<ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
Margin="0,0,0,5"/>
Margin="0,0,0,5"
Style="{x:Null}"/>
<TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
TextAlignment="Center"/>
</UniformGrid>
@@ -28,7 +29,8 @@
<TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
<ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
SelectedIndex="{Binding SelMeasureUnit}" Height="25"
Margin="0,5,0,0"/>
Margin="0,5,0,0"
Style="{x:Null}"/>
</UniformGrid>
<GroupBox Header="{Binding Nesting_Msg}"
Margin="0,0,0,5">
@@ -100,7 +102,8 @@
<TextBlock Text="Reminder Frequency"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding ReminderList}"
SelectedItem="{Binding SelReminder}"/>
SelectedItem="{Binding SelReminder}"
Style="{x:Null}"/>
</Grid>
<StackPanel Grid.Row="3"
Orientation="Horizontal">
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
+1 -1
View File
@@ -107,7 +107,7 @@
Orientation="Horizontal">
<Button Content="Backup"
Command="{Binding Backup_Command}"
Style="{StaticResource ToolBar_TextButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Content="Restore"
Command="{Binding Restore_Command}"
Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml
+1 -1
View File
@@ -72,7 +72,7 @@
Grid.Row="1"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding Machine_Visibility}"
Style="{StaticResource MachinePanel_Button}">
Style="{StaticResource SaveMachinePanel_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
+22 -32
View File
@@ -23,8 +23,8 @@
</Grid.RowDefinitions>
<GroupBox Header="{Binding Filters_Msg}"
Margin="5"
Visibility="{Binding Filters_Visibility}">
Visibility="{Binding Filters_Visibility}"
Style="{StaticResource Filters_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -38,16 +38,14 @@
</Grid.ColumnDefinitions>
<ComboBox ItemsSource="{Binding BTLDateTypeList}"
SelectedIndex="{Binding SelBTLDateType}"
Width="105"
Margin="5"
Style="{StaticResource FeatureComboBox}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
Style="{StaticResource BTLDateTypeList_ComboBox}"/>
<StackPanel Grid.Column="1"
Style="{StaticResource Configuration_StackPanel}">
<ComboBox ItemsSource="{Binding DayTypeList}"
SelectedIndex="{Binding SelDayType}"
Width="105"
Margin="0,0,2.5,0"
Style="{StaticResource PartParam_ComboBox}"/>
<StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
Style="{StaticResource DayTypeList_ComboBox}"/>
<StackPanel Orientation="Horizontal"
Visibility="{Binding Date_Visibility}">
<TextBlock Text="{Binding From_Msg}"
Style="{StaticResource Filter_TextBlock}"/>
<DatePicker SelectedDate="{Binding dtStartDate}"
@@ -61,7 +59,7 @@
<CheckBox Grid.Column="2"
IsChecked="{Binding bViewArchived}"
Content="{Binding ViewArchived_Msg}"
VerticalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
@@ -71,20 +69,18 @@
</Grid.ColumnDefinitions>
<ComboBox ItemsSource="{Binding FilterTypeList}"
SelectedItem="{Binding SelFilterType}"
Width="105"
Margin="5"
Style="{StaticResource FeatureComboBox}"/>
Style="{StaticResource BTLDateTypeList_ComboBox}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding SearchText}"
Margin="5"
Visibility="{Binding SearchText_Visibility}"/>
Visibility="{Binding SearchText_Visibility}"
Style="{StaticResource NewSearchText_TextBox}"/>
<StackPanel Grid.Column="2"
Orientation="Horizontal">
Style="{StaticResource Configuration_StackPanel}">
<TextBlock Text="{Binding Rows_Msg}"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<ComboBox ItemsSource="{Binding RowQuantityList}"
SelectedIndex="{Binding SelRowQuantity}"
Style="{StaticResource FeatureComboBox}"/>
Style="{StaticResource OnyProd_FeatureComboBox}"/>
</StackPanel>
</Grid>
</Grid>
@@ -124,7 +120,6 @@
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
<ToggleButton Grid.Column="1"
Margin="5,0,0,0"
IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
Style="{StaticResource ToolBar_SmallToggleButton}">
<Image Source="\Resources\CalcPanel\Edit.png"
@@ -151,9 +146,7 @@
<DataTemplate>
<Image Source="\Resources\OpenProjectFileDialog\Archived.png"
Visibility="{Binding Archived_Visibility}"
Height="15"
Width="15"
Stretch="UniformToFill"/>
Style="{StaticResource Archived_Image}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
<DataGridTemplateColumn.Header>
@@ -171,13 +164,10 @@
<DataGrid.RowDetailsTemplate>
<DataTemplate>
<ItemsControl ItemsSource="{Binding ProjFileList}"
BorderThickness="0"
Margin="0,-1,0,0"
Padding="0">
Style="{StaticResource ProjFileList_ItemsControl}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid TextBlock.FontSize="12"
TextBlock.FontWeight="Normal">
<Grid Style="{StaticResource ProjFileList_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
<ColumnDefinition Width="1*"/>
@@ -188,11 +178,10 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0"
Grid.ColumnSpan="2"
Background="Gray"
Margin="40,0,40,0"/>
Style="{StaticResource Gray_Grid}"/>
<Grid Grid.Column="1"
Grid.Row="1"
Margin="2">
Style="{StaticResource OnlyProdNewOpenProjectFileDialog_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
@@ -227,7 +216,8 @@
</DataGrid.RowDetailsTemplate>
</EgtBEAMWALL:EgtDataGrid>
<UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
<UniformGrid Columns="4" Grid.Row="2"
Style="{StaticResource OnlyProdNewOpenProjectFileDialog_UniformGrid}">
<Button IsDefault="True" Name="OpenBtn"
Content="{Binding Open_Msg}"
Style="{DynamicResource EgtWPFLib5_InputButton}"/>
EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
+2 -2
View File
@@ -44,7 +44,7 @@
SelectedIndex="{Binding SelDayType}"
Width="105"
Margin="0,0,2.5,0"
Style="{StaticResource PartParam_ComboBox}"/>
Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
<StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
<TextBlock Text="{Binding From_Msg}"
Style="{StaticResource Filter_TextBlock}"/>
@@ -75,7 +75,7 @@
<StackPanel Grid.Column="2"
Orientation="Horizontal">
<TextBlock Text="Rows"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource Option_TextBlock}"/>
<ComboBox ItemsSource="{Binding RowQuantityList}"
SelectedIndex="{Binding SelRowQuantity}"
Style="{StaticResource FeatureComboBox}"/>
EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml
+1 -1
View File
@@ -171,7 +171,7 @@
</DataGrid.Resources>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<Setter Property="Background" Value="{Binding Production_Background}"/>
</Style>
</DataGrid.RowStyle>
EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
+1 -1
View File
@@ -114,7 +114,7 @@
</DataGridTextColumn>
</DataGrid.Resources>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<Setter Property="Background" Value="{Binding Production_Background}"/>
<EventSetter Event="PreviewMouseDown" Handler="RawPartRow_PreviewMouseDown"/>
</Style>
EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
+4 -4
View File
@@ -2,14 +2,14 @@
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"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStyle="None" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
IsClosable="False"
IsMinimizable="False"
IsResizable="False"
Title="AddProcess">
Title="AddProcess"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<Grid Style="{StaticResource NewAddFeature_Grid}">
<Grid.ColumnDefinitions>
@@ -90,10 +90,10 @@
<Button Content="Ok"
Command="{Binding Ok_Command}"
IsDefault="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Content="Cancel"
IsCancel="True"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</UniformGrid>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml
+38 -40
View File
@@ -2,38 +2,36 @@
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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStyle="None" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
IsClosable="False"
IsMinimizable="False"
IsResizable="False"
Title="AddPartWndV">
<Grid Margin="5,5,5,0">
Title="AddPartWndV"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<!--<RowDefinition Height="Auto"/>-->
</Grid.RowDefinitions>
<Grid HorizontalAlignment="Center"
Margin="0,0,0,5">
<Grid Style="{StaticResource OnlyProdAddPart_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Name"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sNAM}"
Grid.Column="1"
Width="200"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sNAM}"
Style="{StaticResource NAM_TextBox}"/>
</Grid>
<Grid Grid.Row="1"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -42,18 +40,18 @@
</Grid.ColumnDefinitions>
<TextBlock Text="Prod Number"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding nPDN}"
Grid.Column="1"
Width="45"/>
<TextBlock Text="Count"
Grid.Column="2"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding nPDN}"
Style="{StaticResource Dimension_TextBox}"/>
<TextBlock Grid.Column="2"
Text="Count"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sCNT}"
Grid.Column="3"
Width="45"/>
<EgtWPFLib5:EgtTextBox Grid.Column="3"
Text="{Binding sCNT}"
Style="{StaticResource Dimension_TextBox}"/>
</Grid>
<Grid Grid.Row="2"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -64,25 +62,25 @@
</Grid.ColumnDefinitions>
<TextBlock Text="W"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sW}"
Grid.Column="1"
Width="45"/>
<TextBlock Text="H"
Grid.Column="2"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sW}"
Style="{StaticResource Dimension_TextBox}"/>
<TextBlock Grid.Column="2"
Text="H"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sH}"
Grid.Column="3"
Width="45"/>
<TextBlock Text="L"
Grid.Column="4"
<EgtWPFLib5:EgtTextBox Grid.Column="3"
Text="{Binding sH}"
Style="{StaticResource Dimension_TextBox}"/>
<TextBlock Grid.Column="4"
Text="L"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sL}"
Grid.Column="5"
Width="45"/>
<EgtWPFLib5:EgtTextBox Grid.Column="5"
Text="{Binding sL}"
Style="{StaticResource Dimension_TextBox}"/>
</Grid>
<Grid Grid.Row="3"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -90,15 +88,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"
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</Grid>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
+17 -18
View File
@@ -2,16 +2,15 @@
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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStyle="None" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
IsClosable="False"
IsMinimizable="False"
IsResizable="False"
Title="AddRawPartWnd">
<Grid Margin="5,5,5,0">
Title="AddRawPartWnd"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -21,12 +20,12 @@
SelectedItem="{Binding SelDimension}"
DisplayMemberPath="sDimension"
Visibility="{Binding DimensionsList_Visibility}"
Margin="0,0,0,5"/>
<ItemsControl ItemsSource="{Binding VariableList}"
Grid.Row="1">
Style="{StaticResource GeneralConfiguration_ComboBox}"/>
<ItemsControl Grid.Row="1"
ItemsSource="{Binding VariableList}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="0,0,0,5">
<Grid Style="{StaticResource OnlyProdAddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -34,15 +33,15 @@
<TextBlock Text="{Binding sMsg}"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sValue}"
Grid.Column="1"
Width="65"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sValue}"
Style="{StaticResource Value_TextBox}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Grid Grid.Row="2"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -50,15 +49,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"
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</Grid>
</Grid>
EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml
+12 -32
View File
@@ -9,13 +9,7 @@
<EgtBEAMWALLCORE:EgtDataGrid x:Name="BTLPart_DataGrid"
ItemsSource="{Binding Tag.BTLPartVMList,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Extended"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
PreviewMouseDown="DataGrid_PreviewMouseDown"
PreviewMouseUp="DataGrid_PreviewMouseUp"
PreviewMouseMove="DataGrid_PreviewMouseMove"
@@ -69,30 +63,24 @@
SortMemberPath="nGlobalState">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid Margin="2,0,0,0" HorizontalAlignment="Center">
<Grid Style="{StaticResource GlobalState_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="25"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="↓"
Foreground="Blue"
TextAlignment="Center"
FontWeight="Bold"
FontSize="18"
Margin="-1,-6,1,-3"
Visibility="{Binding CALC_FALL_Visibility}"/>
Visibility="{Binding CALC_FALL_Visibility}"
Style="{StaticResource CALC_FALL_TextBlock}"/>
<Border Grid.Column="1"
BorderBrush="{Binding Calc_BorderBrush}"
BorderThickness="2"
Padding="1">
Style="{StaticResource CALC_FALL_Border}">
<ItemsControl ItemsSource="{Binding BTLFeatureVMList_View}"
Margin="0"
Padding="0">
Style="{StaticResource CALC_FALL_ItemsControl}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="6" Rows="5"
Margin="0"/>
Style="{StaticResource CALC_FALL_UniformGrid}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
@@ -103,7 +91,7 @@
</ItemsControl>
</Border>
<Grid Grid.Column="2"
HorizontalAlignment="Center">
Style="{StaticResource CALC_ROT_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
@@ -111,20 +99,12 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Width="5"
Height="5"
Fill="Red"
Visibility="{Binding CALC_ROT_Visibility}"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Margin="2,1,-2,0"/>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource CALC_ROT_Ellipse}"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
TextAlignment="Center"
FontWeight="Bold"
FontSize="12"
Margin="2,-6,-2,-3"/>
Style="{StaticResource CALC_ERR_TextBlock}"/>
</Grid>
</Grid>
</DataTemplate>
@@ -135,13 +115,13 @@
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml
+10 -10
View File
@@ -8,70 +8,70 @@
Visibility="{Binding MachiningPage_Visibility}"
ToolTip="{Binding NewRawPart_ToolTip}"
IsEnabled="{Binding BTLPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding NewRawPartLast_Command}"
Visibility="{Binding MachiningPage_Visibility}"
ToolTip="{Binding NewRawPartLast_ToolTip}"
IsEnabled="{Binding BTLPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/NewRawPartAuto.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding AddToRawPart_Command}"
Visibility="{Binding MachiningPage_Visibility}"
ToolTip="{Binding AddToRawPart_ToolTip}"
IsEnabled="{Binding BTLPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/AddToRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding CopyPart_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding CopyPart_ToolTip}"
IsEnabled="{Binding CopyPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding AddPart_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding AddPart_ToolTip}"
IsEnabled="{Binding BTLPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding RemovePart_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding RemovePart_ToolTip}"
IsEnabled="{Binding RemovePart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/RemovePart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding Invert_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding InvertSx_ToolTip}"
IsEnabled="{Binding RotatePart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/PartManager/LeftInvert.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding Invert_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding InvertDx_ToolTip}"
IsEnabled="{Binding RotatePart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/PartManager/RightInvert.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding BackRotation_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding BackRotation_ToolTip}"
IsEnabled="{Binding RotatePart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/PartManager/LeftRotate.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ForwardRotation_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding ForwardRotation_ToolTip}"
IsEnabled="{Binding RotatePart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/PartManager/RightRotate.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml
+3 -3
View File
@@ -23,7 +23,7 @@
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding General_Visibility}"
Style="{StaticResource OptionPanel_Button}">
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
</Button>
</StackPanel>
@@ -40,7 +40,7 @@
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding ParameterQ_Visibility}"
Style="{StaticResource OptionPanel_Button}">
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
</Button>
</StackPanel>
@@ -68,7 +68,7 @@
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding PDFEditor_Visibility}"
Style="{StaticResource OptionPanel_Button}">
Style="{StaticResource SaveOptionPanel_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
</Button>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml
+4 -4
View File
@@ -8,28 +8,28 @@
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding CopyFeature_ToolTip}"
IsEnabled="{Binding CopyFeature_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/CopyFeature.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MacroFeature_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding MacroFeature_ToolTip}"
IsEnabled="{Binding MacroFeature_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/MacroFeature.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding AddFeature_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding AddFeature_ToolTip}"
IsEnabled="{Binding AddFeature_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/AddFeature.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding RemoveFeature_Command}"
Visibility="{Binding ViewPage_Visibility}"
ToolTip="{Binding RemoveFeature_ToolTip}"
IsEnabled="{Binding RemoveFeature_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/LeftPanel/RemoveFeature.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputV.xaml
+1 -1
View File
@@ -30,7 +30,7 @@
Visibility="{Binding Check_Visibility}" Margin="5,0,5,0"
VerticalAlignment="Center"/>
<ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
Visibility="{Binding Combo_Visibility}" Margin="5,0,5,0"/>
Visibility="{Binding Combo_Visibility}" Style="{StaticResource ComboItemsList_ComboBox}"/>
<Grid Margin="5,0,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml
+14 -17
View File
@@ -2,33 +2,30 @@
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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStyle="None" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
IsClosable="False"
IsMinimizable="False"
IsResizable="False"
Title="InputPwdWndV">
<Grid Margin="5,5,5,0">
Title="InputPwdWndV"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding PasswordMsg}"
Style="{StaticResource OptionTextBlock}"
Grid.Row="0"
Margin="0,0,0,5"/>
<PasswordBox PasswordChanged="PasswordBox_PasswordChanged"
HorizontalContentAlignment="Right"
Grid.Row="1"
Margin="0,0,0,5"/>
<TextBlock Grid.Row="0"
Text="{Binding PasswordMsg}"
Style="{StaticResource PasswordMsg_TextBlock}"/>
<PasswordBox Grid.Row="1"
PasswordChanged="PasswordBox_PasswordChanged"/>
<Grid Grid.Row="2"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPartWnd_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -36,14 +33,14 @@
<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 GeneralConfigurationToolBar_TextButton}"/>
<Button Content="Cancel"
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
</Grid>
</Grid>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml
+4
View File
@@ -20,6 +20,10 @@
PreviewMouseUp="DataGrid_PreviewMouseUp"
PreviewMouseMove="DataGrid_PreviewMouseMove"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
EgtBEAMWALL:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
BindingColumns="{Binding PartColumns}"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+18 -14
View File
@@ -10,20 +10,24 @@
<RowDefinition Height="30"/>
</Grid.RowDefinitions>-->
<EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.FeatureVMList,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelFeatureVM,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
BindingColumns="{Binding FeatureInPartInRawPartColumns}"
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelFeatureVM,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
BindingColumns="{Binding FeatureInPartInRawPartColumns}"
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
<DataGrid.InputBindings>
<KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml
+5 -1
View File
@@ -16,6 +16,10 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
IsEnabled="{Binding FeatureList_IsEnabled}"
BindingColumns="{Binding FeatureColumns}"
Style="{StaticResource DataGrid_CustomHighLight}">
@@ -109,7 +113,7 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}" />
</DataGrid.InputBindings>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
<EventSetter Event="PreviewMouseDown" Handler="FeatureList_PreviewMouseDown"/>
</Style>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml
+6 -20
View File
@@ -8,13 +8,7 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelFeatureVM,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
BindingColumns="{Binding FeatureInPartInRawPartColumns}"
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
@@ -38,15 +32,13 @@
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -62,23 +54,17 @@
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="1"
HorizontalAlignment="Center">
Style="{StaticResource CALC_ROT_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Width="5"
Height="5"
Fill="Red"
Visibility="{Binding CALC_ROT_Visibility}"
HorizontalAlignment="Center"/>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_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 OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
</Grid>
</Grid>
</DataTemplate>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
+7 -22
View File
@@ -6,13 +6,7 @@
<EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.BTLFeatureVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
SelectedItem="{Binding Tag.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
IsEnabled="{Binding FeatureList_IsEnabled}"
BindingColumns="{Binding FeatureColumns}"
@@ -33,13 +27,13 @@
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -54,24 +48,16 @@
</Grid.ColumnDefinitions>
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
<!--Width="{Binding ActualHeigth, Source=Self}"/>-->
<Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Width="5"
Height="5"
Fill="Red"
Visibility="{Binding CALC_ROT_Visibility}"
HorizontalAlignment="Center"/>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_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 OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
</Grid>
</Grid>
</DataTemplate>
@@ -97,8 +83,7 @@
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
<Image Source="{Binding sDrawPath}"
Stretch="Uniform"
Margin="2.5"/>
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>
</ToolTip.Content>
</ToolTip>
@@ -111,7 +96,7 @@
</DataGridTextColumn.CellStyle>
</DataGridTextColumn>
<!-- Menu' tasto destro -->
<ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
<ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}">
<ContextMenu.ItemContainerStyle>
<Style TargetType="MenuItem">
<Setter Property="Command" Value="{Binding MenuItem_Command}"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml
+3 -9
View File
@@ -4,13 +4,8 @@
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid AutoGenerateColumns="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
<EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
@@ -45,7 +40,7 @@
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -77,8 +72,7 @@
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
<Image Source="{Binding sDrawPath}"
Stretch="Uniform"
Margin="2.5"/>
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>
</ToolTip.Content>
</ToolTip>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml
-6
View File
@@ -8,15 +8,9 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelPart,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
CanUserSortColumns="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="2.5,0,0,5"
BindingColumns="{Binding PartInRawPartColumns}"
BeginningEdit="PartInRawPartList_BeginningEdit"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml
+6 -13
View File
@@ -3,13 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid AutoGenerateColumns="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
<EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListProdV}}}"
SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListProdV}}}"
@@ -46,7 +42,7 @@
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -71,17 +67,14 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
TextTrimming="CharacterEllipsis"
Margin="4,0,0,0"
Style="{StaticResource OnlyProdPartList_TextBlock}">
Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip>
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<StackPanel Style="{StaticResource OnlyProdQParameterListProd_StackPanel}">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
<Image Source="{Binding sDrawPath}"
Stretch="Uniform"
Margin="2.5"/>
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>
</ToolTip.Content>
</ToolTip>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
+4 -12
View File
@@ -4,13 +4,8 @@
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid AutoGenerateColumns="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
<EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListV}}}"
SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdQParameterListV}}}"
@@ -47,7 +42,7 @@
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
HorizontalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -72,17 +67,14 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
TextTrimming="CharacterEllipsis"
Margin="4,0,0,0"
Style="{StaticResource OnlyProd_TextBlock}">
Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip>
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
<Image Source="{Binding sDrawPath}"
Stretch="Uniform"
Margin="2.5"/>
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>
</ToolTip.Content>
</ToolTip>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml
+8 -23
View File
@@ -8,13 +8,8 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
SelectedItem="{Binding Tag.SelectedMachGroup,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
AutoGenerateColumns="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="2.5,0,0,5"
BindingColumns="{Binding RawPartColumns}"
BeginningEdit="RawPartList_BeginningEdit"
@@ -60,33 +55,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 OnlyProdRawPartList_TextBlock}"/>
<Border Grid.Column="1"
Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="2"
HorizontalAlignment="Center">
Style="{StaticResource CALC_ROT_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Width="5"
Height="5"
Fill="Red"
Visibility="{Binding CALC_ROT_Visibility}"
HorizontalAlignment="Center"/>
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_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 OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
</Grid>
</Grid>
</DataTemplate>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml
+5 -1
View File
@@ -12,13 +12,17 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
IsEnabled="{Binding PParameterList_IsEnabled}"
BindingColumns="{Binding PParameterListColumns}"
Style="{StaticResource DataGrid_CustomHighLight}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<EventSetter Event="PreviewMouseDown" Handler="PParameterList_PreviewMouseDown"/>
</Style>
</DataGrid.RowStyle>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml
+5 -1
View File
@@ -18,6 +18,10 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
BindingColumns="{Binding PartInRawPartColumns}"
BeginningEdit="PartInRawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
@@ -222,7 +226,7 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}" />
</DataGrid.InputBindings>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<Setter Property="Background" Value="{Binding Background}"/>
<EventSetter Event="PreviewMouseDown" Handler="PartInRawPartRow_PreviewMouseDown"/>
</Style>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml
+5 -1
View File
@@ -12,6 +12,10 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
BeginningEdit="QParameterList_BeginningEdit"
@@ -20,7 +24,7 @@
Style="{StaticResource DataGrid_CustomHighLight}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<EventSetter Event="PreviewMouseDown" Handler="QParameterList_PreviewMouseDown"/>
</Style>
</DataGrid.RowStyle>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml
+5 -1
View File
@@ -16,6 +16,10 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
BindingColumns="{Binding RawPartColumns}"
BeginningEdit="RawPartList_BeginningEdit"
Style="{StaticResource DataGrid_CustomHighLight}">
@@ -172,7 +176,7 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
</DataGrid.InputBindings>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Style TargetType="DataGridRow" BasedOn="{StaticResource StaticRowDataGrid_CustomHighLight}">
<Setter Property="Background" Value="{Binding Background}"/>
<EventSetter Event="PreviewMouseDown" Handler="RawPartRow_PreviewMouseDown"/>
</Style>
EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml
+9 -5
View File
@@ -13,7 +13,7 @@
<GroupBox Header="{Binding SearchFilter_Msg}"
IsEnabled="{Binding SearchFilter_IsEnabled}"
Margin="3,1,3,3">
<Expander>
<Expander Style="{x:Null}">
<Expander.Header>
<Grid HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType=ContentPresenter}, Mode=OneWayToSource}">
<Grid.ColumnDefinitions>
@@ -25,7 +25,8 @@
<ComboBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
DisplayMemberPath="sSectionXMaterial"
Grid.Column="1"/>
Grid.Column="1"
Style="{x:Null}"/>
</Grid>
</Expander.Header>
<Grid Margin="1,0,1,0">
@@ -46,7 +47,8 @@
<ComboBox ItemsSource="{Binding Tag.GroupList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
SelectedItem="{Binding Tag.SelGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
Grid.Column="2"
Margin="0,2,0,2"/>
Margin="0,2,0,2"
Style="{x:Null}"/>
<TextBlock Text="{Binding SubGroup_Msg}"
Grid.Row="1"
Grid.ColumnSpan="2"
@@ -55,7 +57,8 @@
SelectedItem="{Binding Tag.SelSubGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
Grid.Column="2"
Grid.Row="1"
Margin="0,2,0,2"/>
Margin="0,2,0,2"
Style="{x:Null}"/>
<TextBlock Text="{Binding ParType_Msg}"
Grid.Row="2"
Grid.ColumnSpan="2"
@@ -64,7 +67,8 @@
SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
Grid.Column="2"
Grid.Row="2"
Margin="0,2,0,2"/>
Margin="0,2,0,2"
Style="{x:Null}"/>
<TextBlock Text="{Binding ParValue_Msg}"
Grid.Row="3"
Grid.ColumnSpan="2"
EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+2 -2
View File
@@ -58,14 +58,14 @@
ToolTip="{Binding Data_ToolTip}"
IsEnabled="{Binding Data_IsEnabled}"
Visibility="{Binding InstrumentButton_Visibilty}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding Parameter_Command}"
ToolTip="{Binding Parameters_ToolTip}"
IsEnabled="{Binding Parameters_IsEnabled}"
Visibility="{Binding InstrumentButton_Visibilty}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
</Button>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
+24 -28
View File
@@ -2,16 +2,16 @@
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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStyle="None" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
IsClosable="False"
IsMinimizable="False"
IsResizable="False"
Title="MovePartInRawPartWndV">
<Grid Margin="5,5,5,0">
Title="MovePartInRawPartWndV"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -19,8 +19,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid HorizontalAlignment="Center"
Margin="0,0,0,5">
<Grid Style="{StaticResource OnlyProdAddPart_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -30,41 +29,38 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding MoveDirMsg}"
Style="{StaticResource OptionTextBlock}"
Grid.ColumnSpan="2"
Margin="0,5"/>
<TextBlock Grid.ColumnSpan="2"
Text="{Binding MoveDirMsg}"
Style="{StaticResource MoveDir_TextBlock}"/>
<RadioButton IsChecked="{Binding LeftIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}"
Grid.Row="1" Grid.Column="0">
<RadioButton Grid.Row="1" Grid.Column="0"
IsChecked="{Binding LeftIsChecked}"
Style="{StaticResource OnlyProdToolBar_ToggleButton}">
<Image Source="/Resources/MovePartInRawPart/MoveLeftParts.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton IsChecked="{Binding RightIsChecked}"
Style="{StaticResource ToolBar_ToggleButton}"
Grid.Row="1" Grid.Column="1">
<RadioButton Grid.Row="1" Grid.Column="1"
IsChecked="{Binding RightIsChecked}"
Style="{StaticResource OnlyProdToolBar_ToggleButton}">
<Image Source="/Resources/MovePartInRawPart/MoveRightParts.png" Stretch="Uniform"/>
</RadioButton>
</Grid>
<Grid Grid.Row="1"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding MoveLenMsg}"
Style="{StaticResource OptionTextBlock}"
HorizontalAlignment="Center"
Margin="0,5"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sMoveLen}"
Grid.Row="1"
Width="200"/>
Style="{StaticResource MoveDir_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Text="{Binding sMoveLen}"
Style="{StaticResource NAM_TextBox}"/>
</Grid>
<Grid Grid.Row="3"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -73,14 +69,14 @@
<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"
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
</Grid>
</Grid>
EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/OnlyProdNestingRunningWndV.xaml
+9 -15
View File
@@ -24,31 +24,25 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="1"
Text="{Binding Section_Msg}"
TextAlignment="Center"/>
Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
<TextBlock Grid.Row="2"
Text="{Binding Nesting_Msg}"
TextAlignment="Center"/>
Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
<ProgressBar Grid.Row="4"
Minimum="0"
Maximum="100"
Value="{Binding CurrProgress_Value}"
Height="20"
Margin="40,0,40,0"/>
Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
<ProgressBar Grid.Row="6"
Minimum="0"
Maximum="100"
Value="{Binding TotProgress_Value}"
Height="20"
Margin="40,0,40,0"/>
Style="{StaticResource OnlyProdNestingRunningWndV_ProgressBar}"/>
<TextBlock Grid.Row="8"
Text="{Binding TotProgress_Msg}"
TextAlignment="Center"/>
<Button Grid.Row="10" Content="Cancel"
Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
<Button Grid.Row="10"
Content="Cancel"
IsDefault="False"
IsCancel="True"
Width="70"
Style="{StaticResource ToolBar_Button}"
Command="{Binding Cancel_Command}"/>
Command="{Binding Cancel_Command}"
Style="{StaticResource OnlyProdNestingRunningWndV_Button}"/>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
+4 -8
View File
@@ -7,17 +7,13 @@
<ComboBox ItemsSource="{Binding PartTypeList}"
SelectedItem="{Binding SelPartType}"
Height="22"
Width="85"
Margin="5,0,2.5,0"
Visibility="{Binding Optimize_Visibility}"/>
Visibility="{Binding Optimize_Visibility}"
Style="{StaticResource Optimize_ComboBox}"/>
<ComboBox ItemsSource="{Binding OriginTypeList}"
SelectedItem="{Binding SelOriginType}"
Height="22"
Width="85"
Margin="2.5,0,5,0"
Visibility="{Binding OriginType_Visibility}"/>
Visibility="{Binding OriginType_Visibility}"
Style="{StaticResource Optimize_ComboBox}"/>
<CheckBox Content="{Binding LongDrillArea_Msg}"
IsChecked="{Binding bLDIntersOther}"
FlowDirection="RightToLeft"
EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/OnlyProdPartInRawPartManagerV.xaml
+4 -4
View File
@@ -8,27 +8,27 @@
Visibility="{Binding MovePart_Visibility}"
ToolTip="{Binding ReOrderPart_ToolTip}"
IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/ReOrderPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MoveUpPart_Command}"
Visibility="{Binding MovePart_Visibility}"
ToolTip="{Binding MoveUpPart_ToolTip}"
IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/MoveUpPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MoveDownPart_Command}"
Visibility="{Binding MovePart_Visibility}"
ToolTip="{Binding MoveDownPart_ToolTip}"
IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/MoveDownPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding RemovePart_Command}"
ToolTip="{Binding RemovePart_ToolTip}"
IsEnabled="{Binding PartInRawPartManager_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/RemovePart.png" Stretch="Uniform"/>
</Button>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/PartManager/PartManagerV.xaml
+8 -2
View File
@@ -36,7 +36,9 @@
UpdateSourceTrigger=Explicit}" Width="65"/>
<TextBlock Text="Inverti"
Style="{StaticResource OptionTextBlock}"
Margin="10,0,0,0"/>
TextAlignment="Center"
VerticalAlignment="Center"
Margin="10,0,0,3"/>
<Image IsEnabled="{Binding Tag.bLockInversion,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
Height="15"
@@ -54,6 +56,7 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
TextAlignment="Center"
Width="25"
Margin="10,7,10,0"
Style="{StaticResource OptionTextBlock}"/>
<Button Command="{Binding Tag.Invert_Command,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
@@ -63,7 +66,9 @@
</Button>
<TextBlock Text="Ruota"
Style="{StaticResource OptionTextBlock}"
Margin="10,0,0,0"/>
VerticalAlignment="Center"
TextAlignment="Center"
Margin="10,0,0,3"/>
<Image IsEnabled="{Binding Tag.bLockRotation,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
Height="15"
@@ -80,6 +85,7 @@
<TextBlock Text="{Binding Tag.sROTATED,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartManagerV}}}"
TextAlignment="Center"
Margin="10,7,10,0"
Width="25"
Style="{StaticResource OptionTextBlock}"/>
<Button Command="{Binding Tag.ForwardRotation_Command,
EgtBEAMWALL.ViewerOptimizer/ProjectTypeWnd/OnlyProdProjectTypeWndV.xaml
+40 -39
View File
@@ -2,8 +2,6 @@
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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
WindowStyle="None" ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
MinWidth="500"
@@ -11,24 +9,21 @@
IsClosable="False"
IsMinimizable="False"
IsResizable="False"
Title="ProjectType">
<StackPanel Margin="5,5,5,0">
Title="ProjectType"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<StackPanel Style="{StaticResource OnlyProdProjectTypeWndV_StackPanel}">
<Border Grid.Row="1"
BorderThickness="1"
BorderBrush="DarkGray"
Background="White"
Margin="5">
<Grid Margin="5">
Style="{StaticResource OnlyProdProjectTypeWndV_Border}">
<Grid Style="{StaticResource NewAddFeature_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid HorizontalAlignment="Center"
Grid.Row="0"
Margin="15">
<Grid Grid.Row="0"
Style="{StaticResource OnlyProdProjectType_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
@@ -37,20 +32,23 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding ChooseMachine_Msg}"
Style="{StaticResource OptionTextBlock}"
Grid.Row="0" Grid.ColumnSpan="2"/>
<Rectangle Height="22" Grid.Row="1"/>
<ComboBox ItemsSource="{Binding MachineList}" DisplayMemberPath="Name"
SelectedItem="{Binding SelMachine}" SelectedValuePath="Name"
Grid.Row="2"
Style="{StaticResource BtlData_ComboBox}"/>
<TextBlock Grid.Row="0"
Grid.ColumnSpan="2"
Text="{Binding ChooseMachine_Msg}"
Style="{StaticResource OptionTextBlock}"/>
<Rectangle Grid.Row="1"
Style="{StaticResource OnlyProdProjectTypeWndV_Rectangle}"/>
<ComboBox Grid.Row="2"
ItemsSource="{Binding MachineList}"
DisplayMemberPath="Name"
SelectedItem="{Binding SelMachine}"
SelectedValuePath="Name"
Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
</Grid>
<Grid HorizontalAlignment="Center"
Grid.Row="1"
Margin="15"
Visibility="{Binding IsBoth_Visibility}">
<Grid Grid.Row="1"
Visibility="{Binding IsBoth_Visibility}"
Style="{StaticResource OnlyProdProjectType_Grid}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
@@ -59,17 +57,20 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding ChooseType_Msg}"
Style="{StaticResource OptionTextBlock}"
Grid.Row="0" Grid.ColumnSpan="2"/>
<Rectangle Height="22" Grid.Row="1"/>
<ComboBox ItemsSource="{Binding TypeList}"
<TextBlock Grid.Row="0"
Grid.ColumnSpan="2"
Text="{Binding ChooseType_Msg}"
Style="{StaticResource OptionTextBlock}"/>
<Rectangle Grid.Row="1"
Style="{StaticResource OnlyProdProjectTypeWndV_Rectangle}"/>
<ComboBox Grid.Row="2"
ItemsSource="{Binding TypeList}"
SelectedItem="{Binding nSelType}"
Grid.Row="2"
Style="{StaticResource BtlData_ComboBox}"/>
Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
</Grid>
<Grid Grid.Row="2" Margin="5">
<Grid Grid.Row="2"
Style="{StaticResource NewAddFeature_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -77,15 +78,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"
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Grid.Column="3"
Content="Cancel"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</Grid>
</Grid>
EgtBEAMWALL.ViewerOptimizer/RawPartManager/OnlyProdRawPartManagerV.xaml
+6 -6
View File
@@ -8,39 +8,39 @@
ToolTip="{Binding ProduceRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Visibility="{Binding ProduceRawPart_Visibility}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/ProduceRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ProduceAllRawPart_Command}"
ToolTip="{Binding ProduceAllRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Visibility="{Binding ProduceRawPart_Visibility}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/ProduceAllRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding CopyRawPart_Command}"
ToolTip="{Binding CopyRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/CopyRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding RemoveRawPart_Command}"
ToolTip="{Binding RemoveRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/RemoveRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding RemoveAllRawPart_Command}"
ToolTip="{Binding RemoveAllRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/RemoveAllRawPart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MovePartInRawPart_Command}"
ToolTip="{Binding MovePartInRawPart_ToolTip}"
IsEnabled="{Binding RawPartManagerIsEnabled}"
Visibility="{Binding MovePartInRawPart_Visibility}"
Style="{StaticResource LeftPanel_Button}">
Style="{StaticResource OnlyProdLeftPanel_Button}">
<Image Source="/Resources/TopPanel/MovePartInRawPart.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.ViewerOptimizer/ShowPanel/ShowPanelV.xaml
+3 -3
View File
@@ -6,17 +6,17 @@
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource Radio_ToggleButton}"
IsChecked="{Binding WireframeIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingHLToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource Radio_ToggleButton}"
IsChecked="{Binding HiddenLineIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingSHToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource Radio_ToggleButton}"
IsChecked="{Binding ShadingIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
</RadioButton>
EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
+3 -3
View File
@@ -227,19 +227,19 @@
Grid.Column="2"
IsChecked="{Binding bRawPart_IsChecked}"
ToolTip="Materials"
Style="{StaticResource ToolBar_ToggleButton}">
Style="{StaticResource OnlyProdToolBar_ToggleButton}">
<!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
</ToggleButton>
<Button Grid.Column="3"
ToolTip="{Binding CopyToClipboard_Msg}"
x:Name="CopyToClipboardBtn"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource CopyToClipboard_ToolBar_Button}">
<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="4"
ToolTip="{Binding PrintPDF_Msg}"
Command="{Binding PrintPDF_Command}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource CopyToClipboard_ToolBar_Button}">
<Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
</Button>
</Grid>
EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
+2 -2
View File
@@ -169,13 +169,13 @@
<Button Grid.Column="1"
ToolTip="{Binding CopyToClipboard_Msg}"
x:Name="CopyToClipboardBtn"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource CopyToClipboard_ToolBar_Button}">
<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
</Button>
<Button Grid.Column="2"
ToolTip="{Binding PrintPDF_Msg}"
Command="{Binding PrintPDF_Command}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource CopyToClipboard_ToolBar_Button}">
<Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
</Button>
</Grid>
EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateBTLWndV.xaml
+2 -2
View File
@@ -91,12 +91,12 @@
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
Command="{Binding Cancel_Command}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</Grid>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/UpdateBTLWnd/OnlyProdUpdateOrAppendWndV.xaml
+2 -2
View File
@@ -56,11 +56,11 @@
Command="{Binding Ok_Command}"
IsDefault="True"
Grid.Column="1"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
<Button Content="{Binding Cancel_Msg}"
IsCancel="True"
Grid.Column="3"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</Grid>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+1222 -140
View File
File diff suppressed because it is too large Load Diff
EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
+152 -154
View File
@@ -19,7 +19,7 @@
Title="WarehouseWndV"
Name="WarehouseWndV">
<Grid Margin="5,5,5,0">
<Grid Style="{StaticResource OnlyProdWarehouse_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
@@ -44,65 +44,67 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding CurrentS_Msg}"
Grid.Row="0"
Style="{StaticResource PartParam_TextBlock}"
Visibility="{Binding Basic_Visibility}"/>
<ComboBox ItemsSource="{Binding Path=SParamList,
<TextBlock Grid.Row="0"
Text="{Binding CurrentS_Msg}"
Visibility="{Binding Basic_Visibility}"
Style="{StaticResource OnlyProdPartParam_TextBlock}"/>
<ComboBox Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=SParamList,
Mode=OneWay}"
SelectedItem="{Binding Path=SelCurrentS,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
DisplayMemberPath="sValue"
Grid.Row="0"
Grid.Column="1"
Style="{StaticResource Warehouse_ComboBox}"
Visibility="{Binding Basic_Visibility}"/>
Visibility="{Binding Basic_Visibility}"
Style="{StaticResource OnlyProdWarehouse_ComboBox}"/>
<TextBlock Text="{Binding StartOffset_Msg}"
Grid.Row="1"
Style="{StaticResource PartParam_TextBlock}"
Visibility="{Binding StartOffset_Visibility}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding dStartOffset, UpdateSourceTrigger=PropertyChanged}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding StartOffset_Msg}"
Visibility="{Binding StartOffset_Visibility}"
Style="{StaticResource OnlyProdPartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Style="{StaticResource Warehouse_TextBox}"
Visibility="{Binding StartOffset_Visibility}"/>
Text="{Binding dStartOffset, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding StartOffset_Visibility}"
Style="{StaticResource Warehouse_TextBox}"/>
<TextBlock Text="{Binding Kerf_Msg}"
Grid.Row="1"
Style="{StaticResource PartParam_TextBlock}"
Visibility="{Binding Kerf_Visibility}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding dKerf, UpdateSourceTrigger=PropertyChanged}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding Kerf_Msg}"
Visibility="{Binding Kerf_Visibility}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Style="{StaticResource Warehouse_TextBox}"
Visibility="{Binding Kerf_Visibility}"/>
Text="{Binding dKerf, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Kerf_Visibility}"
Style="{StaticResource Warehouse_TextBox}"/>
<TextBlock Text="{Binding Offset_Msg}"
Grid.Row="2"
Style="{StaticResource PartParam_TextBlock}"
Visibility="{Binding Offset_Visibility}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding dOffset, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
Grid.Row="2"
<TextBlock Grid.Row="2"
Text="{Binding Offset_Msg}"
Visibility="{Binding Offset_Visibility}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="2"
Grid.Column="1"
Style="{StaticResource Warehouse_TextBox}"
Visibility="{Binding Offset_Visibility}"/>
Text="{Binding dOffset, Mode=TwoWay, UpdateSourceTrigger=LostFocus}"
Visibility="{Binding Offset_Visibility}"
Style="{StaticResource Warehouse_TextBox}"/>
<TextBlock Text="{Binding Quantity_Msg}"
Grid.Row="3"
Style="{StaticResource PartParam_TextBlock}"
Visibility="{Binding Basic_Visibility}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding nQuantity, UpdateSourceTrigger=PropertyChanged}"
Grid.Row="3"
<TextBlock Grid.Row="3"
Text="{Binding Quantity_Msg}"
Visibility="{Binding Basic_Visibility}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="3"
Grid.Column="1"
Style="{StaticResource Warehouse_TextBox}"
Visibility="{Binding Basic_Visibility}"/>
Text="{Binding nQuantity, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Basic_Visibility}"
Style="{StaticResource Warehouse_TextBox}"/>
<GroupBox Grid.Row="3" Grid.ColumnSpan="3"
Margin="0,0,0,5"
<GroupBox Grid.Row="3"
Grid.ColumnSpan="3"
Header="{Binding Offset_Msg}"
Visibility="{Binding MediumWall_Visibility}">
<Grid Grid.Row="3" Grid.ColumnSpan="3">
Visibility="{Binding MediumWall_Visibility}"
Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
<Grid Grid.Row="3"
Grid.ColumnSpan="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
@@ -113,33 +115,35 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0" Grid.Column="0">
<Grid Grid.Row="0"
Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding MinThickness_Msg}"
Grid.Column="0"
HorizontalAlignment="Center"/>
<TextBlock Text="{Binding Value_Msg}"
Grid.Column="1"
HorizontalAlignment="Center"/>
<TextBlock Text="{Binding MaxThickness_Msg}"
Grid.Column="2"
HorizontalAlignment="Center"/>
<TextBlock Grid.Column="0"
Text="{Binding MinThickness_Msg}"
Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
<TextBlock Grid.Column="1"
Text="{Binding Value_Msg}"
Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
<TextBlock Grid.Column="2"
Text="{Binding MaxThickness_Msg}"
Style="{StaticResource OnlyProdNestingRunningWndV_TextBlock}"/>
</Grid>
<Button Content="+"
Grid.Column="1"
Command="{Binding AddWhWallParam_Command}"
Style="{StaticResource ToolBar_SmallButton}"/>
Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
<Button Content="-"
Grid.Column="2"
Command="{Binding RemoveWhWallParam_Command}"
Style="{StaticResource ToolBar_SmallButton}"/>
Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
<Grid Grid.Row="1" Grid.Column="0">
<Grid Grid.Row="1"
Grid.Column="0">
<EgtWPFLib5:EgtScrollViewer Focusable="False" MaxHeight="200" VerticalScrollBarVisibility="Auto">
<ItemsControl ItemsSource="{Binding WhWallParamList}">
<ItemsControl.ItemTemplate>
@@ -150,19 +154,15 @@
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding dMinThickness, Mode=OneWay}"
Grid.Column="0"
Width="70"
Margin="15,5"
HorizontalAlignment="Center"/>
<EgtWPFLib5:EgtTextBox Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
Grid.Column="1"
Width="70"
Margin="15,5"/>
<EgtWPFLib5:EgtTextBox Text="{Binding dMaxThickness, UpdateSourceTrigger=Explicit}"
Grid.Column="2"
Width="70"
Margin="15,5"/>
<TextBlock Grid.Column="0"
Text="{Binding dMinThickness, Mode=OneWay}"
Style="{StaticResource OnlyProdWarehouseWndV_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding dOffset, UpdateSourceTrigger=Explicit}"
Style="{StaticResource OnlyProdWarehouseWndV_TextBox}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="2"
Text="{Binding dMaxThickness, UpdateSourceTrigger=Explicit}"
Style="{StaticResource OnlyProdWarehouseWndV_TextBox}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -171,50 +171,50 @@
</Grid>
</Grid>
</GroupBox>
</Grid>
<GroupBox Header="{Binding SParams_Msg}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,5" Visibility="{Binding Basic_Visibility}">
<GroupBox Grid.Row="1"
Grid.Column="0"
Header="{Binding SParams_Msg}"
Visibility="{Binding Basic_Visibility}"
Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
<ListBox ItemsSource="{Binding SParamList}"
SelectedItem="{Binding SelSParam}"
DisplayMemberPath="sValue"
Margin="5"
MinHeight="40"/>
Style="{StaticResource OnlyProdWarehouseWndV_ListBox}"/>
</GroupBox>
<GroupBox Header="{Binding SParams_Msg}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,5" Visibility="{Binding Medium_Visibility}">
<GroupBox Grid.Row="1"
Grid.Column="0"
Header="{Binding SParams_Msg}"
Visibility="{Binding Medium_Visibility}"
Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPart_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Content="+"
Grid.Column="2"
<Button Grid.Column="2"
Content="+"
Command="{Binding AddMediumParam_Command}"
Style="{StaticResource ToolBar_SmallButton}"/>
<Button Content="-"
Grid.Column="3"
Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
<Button Grid.Column="3"
Content="-"
Command="{Binding RemoveMediumParam_Command}"
Style="{StaticResource ToolBar_SmallButton}"/>
Style="{StaticResource OnlyProdWWnd_SmallButton}"/>
</Grid>
<EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
ItemsSource="{Binding SParamList}"
SelectedItem="{Binding SelSParam}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
@@ -233,7 +233,7 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bActive, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center"/>
Style="{StaticResource OnlyProdBTLPartList_CheckBox}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -292,7 +292,9 @@
</Grid>
</GroupBox>
<Grid Grid.Row="2" Margin="0,0,0,5" Visibility="{Binding AddRemoveBtns_Visibility}">
<Grid Grid.Row="2"
Visibility="{Binding AddRemoveBtns_Visibility}"
Style="{StaticResource OnlyProdAddPart_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
@@ -302,26 +304,25 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Button Content="+"
FontSize="20"
FontWeight="Light"
Grid.Row="1"
<Button Grid.Row="1"
Grid.Column="0"
Style="{StaticResource ToolBar_Button}"
Command="{Binding AddParam_Command}">
Content="+"
Command="{Binding AddParam_Command}"
Style="{StaticResource OnlyProdWarehouseWndV_Button}">
</Button>
<Button Content="-"
FontSize="20"
FontWeight="Light"
Grid.Row="1"
<Button Grid.Row="1"
Grid.Column="1"
Style="{StaticResource ToolBar_Button}"
Command="{Binding RemoveParam_Command}">
Content="-"
Command="{Binding RemoveParam_Command}"
Style="{StaticResource OnlyProdWarehouseWndV_Button}">
</Button>
</Grid>
<GroupBox Header="{Binding NewParam_Msg}" Margin="0,0,0,5" Grid.Row="3" Visibility="{Binding NewBeamParam_Visibility}">
<GroupBox Grid.Row="3"
Header="{Binding NewParam_Msg}"
Visibility="{Binding NewBeamParam_Visibility}"
Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
@@ -333,33 +334,34 @@
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding L_Msg}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
HorizontalAlignment="Right"
Style="{StaticResource Warehouse_TextBox}"/>
<Grid Grid.Row="1" Grid.ColumnSpan="2">
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource New_TextBox}"/>
<Grid Grid.Row="1"
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding OkAddParam_Msg}"
Grid.Column="0"
Height="30"
Margin="0,0,2.5,0"
Command="{Binding OkAddParam_Command}">
<Button Grid.Column="0"
Content="{Binding OkAddParam_Msg}"
Command="{Binding OkAddParam_Command}"
Style="{StaticResource OKAddParam_Button}">
</Button>
<Button Content="{Binding Cancel_Msg}"
Grid.Column="1"
Height="30"
Margin="2.5,0,0,0"
Command="{Binding CancelAddParam_Command}">
<Button Grid.Column="1"
Content="{Binding Cancel_Msg}"
Command="{Binding CancelAddParam_Command}"
Style="{StaticResource CancelAddParam_Button}">
</Button>
</Grid>
</Grid>
</GroupBox>
<GroupBox Header="{Binding NewParam_Msg}" Margin="0,0,0,5" Grid.Row="3" Visibility="{Binding NewWallParam_Visibility}">
<Grid >
<GroupBox Grid.Row="3"
Header="{Binding NewParam_Msg}"
Visibility="{Binding NewWallParam_Visibility}"
Style="{StaticResource OnlyProdWarehouseWndV_GroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
@@ -371,57 +373,53 @@
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding W_Msg}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sNewW, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
HorizontalAlignment="Right"
Style="{StaticResource Warehouse_TextBox}"/>
<TextBlock Text="{Binding L_Msg}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sNewW, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource New_TextBox}"/>
<TextBlock Grid.Row="1"
Text="{Binding L_Msg}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
HorizontalAlignment="Right"
Style="{StaticResource Warehouse_TextBox}"/>
<Grid Grid.Row="2" Grid.ColumnSpan="2">
Text="{Binding sNewL, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource New_TextBox}"/>
<Grid Grid.Row="2"
Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="368*"/>
<ColumnDefinition Width="117*"/>
<ColumnDefinition Width="251*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding OkAddParam_Msg}"
Grid.Column="0"
Height="30"
Margin="0,0,2,0"
Command="{Binding OkAddParam_Command}">
<Button Grid.Column="0"
Content="{Binding OkAddParam_Msg}"
Command="{Binding OkAddParam_Command}"
Style="{StaticResource OKAddParam_Button}">
</Button>
<Button Content="{Binding Cancel_Msg}"
Grid.Column="1"
Height="30"
Margin="2,0,0,0"
Command="{Binding CancelAddParam_Command}" Grid.ColumnSpan="2">
<Button Grid.Column="1"
Grid.ColumnSpan="2"
Content="{Binding Cancel_Msg}"
Command="{Binding CancelAddParam_Command}"
Style="{StaticResource CancelAddParam_Button}">
</Button>
</Grid>
</Grid>
</GroupBox>
<Grid Grid.Row="4"
Margin="0,0,0,5">
Style="{StaticResource OnlyProdAddPart_Grid}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button Content="{Binding Save_Msg}"
Grid.Column="0"
Height="30"
Margin="0,0,2.5,0"
Command="{Binding Save_Command}">
<Button Grid.Column="0"
Content="{Binding Save_Msg}"
Command="{Binding Save_Command}"
Style="{StaticResource OKAddParam_Button}">
</Button>
<Button Content="{Binding Cancel_Msg}"
Grid.Column="1"
Height="30"
Margin="2.5,0,0,0"
Command="{Binding Cancel_Command}">
<Button Grid.Column="1"
Content="{Binding Cancel_Msg}"
Command="{Binding Cancel_Command}"
Style="{StaticResource CancelAddParam_Button}">
</Button>
</Grid>
EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndV.xaml
+14 -10
View File
@@ -206,16 +206,20 @@
Style="{StaticResource ToolBar_SmallButton}"/>
</Grid>
<EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
ItemsSource="{Binding SParamList}"
SelectedItem="{Binding SelSParam}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
BindingColumns="{Binding SParamColumns}">
ItemsSource="{Binding SParamList}"
SelectedItem="{Binding SelSParam}"
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
ColumnHeaderFontWeight="Normal"
ColumnHeaderPadding="0,2,0,2"
BindingColumns="{Binding SParamColumns}">
<DataGrid.Resources>
<!-- Active -->
<DataGridTemplateColumn x:Key="colACTIVE" >