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

-modificato grafica expander, combobox e button

Browse Source
This commit is contained in:
Demetrio Cassarino
2024-05-10 16:50:35 +02:00
parent 65f1458ec1
commit e75a9915aa
32 changed files with 569 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml
+1
View File
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="0,1,30,1"
DataContext="{StaticResource BTLPartManagerVM}">
<Button Command="{Binding NewRawPart_Command}"
EgtBEAMWALL.ViewerOptimizer/CALCPanel/OnlyProdCalcPanelV.xaml
+8 -8
View File
@@ -3,12 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<Button FontSize="20"
FontWeight="Light"
ToolTip="{Binding Verify_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding Verify_Command}"
IsEnabled="{Binding Verify_IsEnabled}">
<Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
@@ -16,7 +16,7 @@
<Button FontSize="20"
FontWeight="Light"
ToolTip="{Binding VerifyAll_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding VerifyAll_Command}"
IsEnabled="{Binding VerifyAll_IsEnabled}">
<Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
@@ -24,24 +24,24 @@
<Button Command="{Binding ResetCalc_Command}"
ToolTip="{Binding ResetCalc_ToolTip}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding Simulate_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding Simulate_Command}"
IsEnabled="{Binding Simulate_IsEnabled}">
<Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding Edit_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding Edit_Command}"
IsEnabled="{Binding Edit_IsEnabled}"
Visibility="{Binding Edit_Visibility}">
<Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ChooseMachine_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding ChooseMachine_Command}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Visibility="{Binding ChooseMachineBtn_Visibility}">
@@ -61,7 +61,7 @@
<Button Content="OK"
FontSize="10"
FontWeight="Light"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding Ok_Command}"
Grid.Column="1"/>
</Grid>
EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml
+2
View File
@@ -3,6 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Horizontal"
HorizontalAlignment="Right"
Height="40"
Margin="0,1,60,1"
DataContext="{StaticResource FeatureListManagerVM}">
<Button Command="{Binding CopyFeature_Command}"
EgtBEAMWALL.ViewerOptimizer/FeatureManager/OnlyProdFeatureManagerV.xaml
+5 -7
View File
@@ -4,22 +4,21 @@
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Orientation="Horizontal"
Height="32">
Height="40"
Margin="0,3,0,-3">
<TextBlock Text="{Binding Face_Msg}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Style="{StaticResource OptionTextBlock}"/>
<ComboBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Style="{StaticResource FeatureComboBox}"/>
IsEnabled="{Binding FeatureManager_IsEnabled}"/>
<TextBlock Text="{Binding Group_Msg}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Style="{StaticResource OptionTextBlock}"/>
<ComboBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Style="{StaticResource FeatureComboBox}"/>
IsEnabled="{Binding FeatureManager_IsEnabled}"/>
<TextBlock Text="{Binding Priority_Msg}"
IsEnabled="{Binding FeatureManager_IsEnabled}"
Visibility="{Binding Priority_Visibility}"
@@ -35,8 +34,7 @@
<Button Content="{Binding Edit_Msg}"
Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
IsEnabled="{Binding Edit_IsEnabled}"
Style="{StaticResource EgtWPFLib5_InputButton}"/>
IsEnabled="{Binding Edit_IsEnabled}"/>
<Button Content="{Binding Save_Msg}"
Command="{Binding Tag.Save_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
EgtBEAMWALL.ViewerOptimizer/FreeContourManager/OnlyProdFreeContourManagerV.xaml
+11 -11
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<ComboBox ItemsSource="{Binding TypeList}"
SelectedIndex="{Binding SelType, Delay=1}"
@@ -17,52 +17,52 @@
<Button Command="{Binding Line2P_Command}"
ToolTip="{Binding Line2P_ToolTip}"
IsEnabled="{Binding Line2P_IsEnabled}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding Delete_Command}"
ToolTip="{Binding Delete_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ModifyCurve_Command}"
ToolTip="{Binding ModifyCurve_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding AddPointCurve_Command}"
ToolTip="{Binding AddPointCurve_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding RemovePointCurve_Command}"
ToolTip="{Binding RemovePointCurve_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ChangeStart_Command}"
ToolTip="{Binding ChangeStart_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding InvertCurve_Command}"
ToolTip="{Binding InvertCurve_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding Move_Command}"
ToolTip="{Binding Move_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding Rotate_Command}"
ToolTip="{Binding Rotate_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding TextAngle_Command}"
ToolTip="{Binding TextAngle_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Visibility="{Binding TextAngle_Visibility}">
<Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/OnlyProdInstrumentPanelV.xaml
+7 -7
View File
@@ -3,16 +3,16 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<ToggleButton ToolTip="{Binding GetDistToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource ToolBarOnlyProd_ToggleButton}"
IsChecked="{Binding GetDistIsChecked}">
<Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
</ToggleButton>
<Button ToolTip="{Binding ChangeParam_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding ChangeParameter_Command}"
Visibility="{Binding ChangeParam_Visibility}"
IsEnabled="{Binding InstrumentPanel_IsEnabled}">
@@ -20,7 +20,7 @@
</Button>
<Button ToolTip="{Binding ChangeMaterial_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding ChangeMaterial_Command}"
Visibility="{Binding ChangeMaterial_Visibility}"
IsEnabled="{Binding InstrumentPanel_IsEnabled}"
@@ -28,7 +28,7 @@
</Button>
<ToggleButton ToolTip="{Binding Statistics_Msg}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource ToolBarOnlyProd_ToggleButton}"
Visibility="{Binding Statistic_Visibility}"
IsChecked="{Binding Statistics_IsChecked}"
IsEnabled="{Binding Statistics_IsEnabled}">
@@ -37,7 +37,7 @@
<Button Command="{Binding Visualization_Command}"
ToolTip="{Binding Statistics_Msg}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Visibility="{Binding VisStatistic_Visibility}"
IsEnabled="{Binding VisStatistic_IsEnabled}">
<Image Source="/Resources/InstrumentPanel/Vis.png" Stretch="Uniform"/>
@@ -45,7 +45,7 @@
<Button Command="{Binding Optimizer_Command}"
ToolTip="{Binding Statistics_Msg}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Visibility="{Binding OtStatistic_Visibility}"
IsEnabled="{Binding OtStatistic_IsEnabled}">
<Image Source="/Resources/InstrumentPanel/Ott.png" Stretch="Uniform"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml
+5 -3
View File
@@ -20,7 +20,7 @@
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Christine}"
ColumnHeaderBackground="{StaticResource BeamWall_NeonCarrot}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
@@ -38,13 +38,15 @@
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
HorizontalAlignment="Center"/>
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"/>
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
+2 -2
View File
@@ -18,7 +18,7 @@
BindingColumns="{Binding FeatureColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
ColumnHeaderBackground="{StaticResource BeamWall_Keppel}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
@@ -47,7 +47,7 @@
<DataGridTemplateColumn x:Key="colCALC">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid>
<Grid HorizontalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="10"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml
+1 -1
View File
@@ -18,7 +18,7 @@
BindingColumns="{Binding PParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
ColumnHeaderBackground="{StaticResource BeamWall_Downy}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml
+2 -2
View File
@@ -17,12 +17,12 @@
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
Margin="2.5,0,0,5"
BindingColumns="{Binding PartInRawPartColumns}"
BeginningEdit="PartInRawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Christine}"
ColumnHeaderBackground="{StaticResource BeamWall_Jaffa}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml
+1 -1
View File
@@ -18,7 +18,7 @@
BindingColumns="{Binding QParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Christine}"
ColumnHeaderBackground="{StaticResource BeamWall_TexasRose}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
+1 -1
View File
@@ -19,7 +19,7 @@
BindingColumns="{Binding QParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
ColumnHeaderBackground="{StaticResource BeamWall_Downy}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml
+1 -1
View File
@@ -15,7 +15,7 @@
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
Margin="2.5,0,0,5"
BindingColumns="{Binding RawPartColumns}"
BeginningEdit="RawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+13 -2
View File
@@ -7,6 +7,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<UniformGrid Columns="5" Margin="0,10,0,10">
<Expander Header="{Binding Section_Msg}">
@@ -47,8 +48,12 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border BorderThickness="2" Grid.RowSpan="2" CornerRadius="4" BorderBrush="{StaticResource BeamWall_Glacier}" />
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Left">
HorizontalAlignment="Left"
Margin="10,1,0,1">
<Button Command="{Binding Data_Command}"
ToolTip="{Binding Data_ToolTip}"
IsEnabled="{Binding Data_IsEnabled}"
@@ -67,6 +72,12 @@
<EgtBEAMWALL:OnlyProdBTLPartListV DataContext="{StaticResource PartListVM}"
Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
Grid.Row="1"/>
Grid.Row="1"
Margin="4,0,4,0"/>
</Grid>
<EgtBEAMWALL:OnlyProdPartManagerV Grid.Row="2"
DataContext="{StaticResource PartManagerVM}"
Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"/>
</Grid>
EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerV.xaml
+11 -9
View File
@@ -10,14 +10,15 @@
<!--Barra superiore dei comandi-->
<Button Command="{Binding New_Command}"
ToolTip="{Binding NewToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}"
Margin="120,2.5,2.5,2.5">
<Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding OpenCommand}"
ToolTip="{Binding OpenToolTip}"
ContextMenuService.Placement="Bottom"
Tag="{Binding}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Button.ContextMenu>
<ContextMenu ItemsSource="{Binding MruFileNames}">
<ContextMenu.Resources>
@@ -33,40 +34,41 @@
</Button>
<Button Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding AddProj_Command}"
ToolTip="{Binding AddProj_ToolTip}"
Visibility="{Binding AddProj_Visibility}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ImportBTL_Command}"
ToolTip="{Binding ImportBTL_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding UpdateBTL_Command}"
ToolTip="{Binding UpdateBTL_ToolTip}"
Visibility="{Binding UpdateBTL_Visibility}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Image Source="/Resources/ProjectManager/UpdateBTL.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ExportProject_Command}"
ToolTip="{Binding ExportProject_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding ImportProject_Command}"
ToolTip="{Binding ImportProject_ToolTip}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}">
<Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding GoToSupervisor_Command}"
ToolTip="{Binding GoToSupervisor_ToolTip}"
Visibility="{Binding GoToSupervisor_Visibility}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBarOnlyProd_Button}"
Margin="10,2.5,220,2.5">
<Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
+27 -8
View File
@@ -8,19 +8,17 @@
<EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top" Background="{StaticResource BeamWall_RegentStBlue}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}"
Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<EgtBEAMWALL:OnlyProdOptimizePanelV Grid.Column="1"
DataContext="{StaticResource OptimizePanelVM}"
Visibility="{Binding DataContext.OnlyProdOptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
<EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}" HorizontalAlignment="Center"
Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="0,10,0,10"
Background="{StaticResource BeamWall_White}"/>
<EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="1"
DataContext="{StaticResource StatisticsTimePanelVM}"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="800,10,0,10"/>
Margin="350,10,0,10"/>
</Grid>
</EgtFloating:EgtFloatingTray>
@@ -39,6 +37,7 @@
<EgtBEAMWALL:OnlyProdLeftPanelV DataContext="{StaticResource LeftPanelVM}"
Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Visibility="{Binding DataContext.OnlyProdLeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<GridSplitter Grid.Column="1"
Width="3"
HorizontalAlignment="Center"
@@ -48,8 +47,14 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<WrapPanel Orientation="Horizontal"
HorizontalAlignment="Center"
Margin="5"
Grid.ColumnSpan="2"
Width="{Binding ActualWidth, ElementName=TOPTRAY}">
<EgtBEAMWALL:OnlyProdShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
<EgtBEAMWALL:OnlyProdShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
@@ -62,7 +67,21 @@
<EgtBEAMWALL:OnlyProdFreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
</WrapPanel>
<EgtBEAMWALL:SceneHostV Grid.Row="1"/>
<Border BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="4"
Grid.Row="1"
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="2,0,2,0">
<EgtBEAMWALL:OnlyProdOptimizePanelV DataContext="{StaticResource OptimizePanelVM}"
Visibility="{Binding DataContext.OnlyProdOptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="1,5,1,5"/>
</Border>
</Grid>
</Grid>
EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OnlyProdOptimizePanelV.xaml
+17 -18
View File
@@ -1,29 +1,28 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdOptimizePanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False"
Style="{StaticResource ToolBar_EgtFloatingPanel}">
<StackPanel x:Class="OnlyProdOptimizePanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Vertical"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ComboBox ItemsSource="{Binding PartTypeList}"
SelectedItem="{Binding SelPartType}"
Height="22"
Width="85"
Margin="5,0,2.5,0"/>
Margin="5,5,2.5,20"/>
<Button Content="{Binding Optimize_Msg}"
Width="70"
FontWeight="Light"
Style="{StaticResource ToolBar_Button}"
Command="{Binding Optimize_Command}"
IsEnabled="{Binding Optimize_IsEnabled}">
</Button>
<Button Content="{Binding Optimize_Msg}"
Width="70"
Height="30"
FontWeight="Light"
Command="{Binding Optimize_Command}"
IsEnabled="{Binding Optimize_IsEnabled}"
Margin="0,0,0,20"/>
<Button ToolTip="{Binding Warehouse_ToolTip}"
Style="{StaticResource ToolBar_Button}"
Command="{Binding Warehouse_Command}">
Command="{Binding Warehouse_Command}"
Margin="0,0,0,5">
<Image Source="/Resources/OptimizePanel/Warehouse.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/OnlyProdPartInRawPartManagerV.xaml
+3 -2
View File
@@ -1,8 +1,9 @@
<StackPanel x:Class="OnlyProdPartInRawPartManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Vertical"
HorizontalAlignment="Right"
Orientation="Horizontal"
HorizontalAlignment="Left"
Margin="30,1,0,1"
DataContext="{StaticResource PartInRawPartManagerVM}">
<Button Command="{Binding ReOrderPart_Command}"
EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
+8 -6
View File
@@ -3,15 +3,17 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border BorderThickness="2" Grid.RowSpan="2" CornerRadius="4" BorderBrush="{StaticResource BeamWall_Glacier}" />
<EgtBEAMWALL:OnlyProdPartInRawPartManagerV />
<EgtBEAMWALL:OnlyProdPartInRawPartListV Grid.Column="1"
<EgtBEAMWALL:OnlyProdPartInRawPartListV Grid.Row="1"
DataContext="{StaticResource PartInRawPartListVM}"
Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartManagerWndV}}}"
Margin="0,0,5,0"/>
Margin="0,0,2,0"/>
</Grid>
EgtBEAMWALL.ViewerOptimizer/PartManager/OnlyProdPartManagerV.xaml
+78 -48
View File
@@ -3,39 +3,66 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Height="32"
Margin="0,10,0,40"
Height="120"
Background="{StaticResource BeamWall_Glacier}"
IsEnabled="{Binding PartManager_IsEnabled}">
<StackPanel Orientation="Horizontal">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Background="{StaticResource Omag_White}"
Margin="15,20,25,0">
<UniformGrid Columns="4"
Margin="10,0,15,0">
<TextBlock Text="BTL Qty"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<TextBlock Text="{Binding Tag.sCNT,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}"
Width="25"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<TextBlock Text="Added Qty"
Style="{StaticResource OptionTextBlock}"/>
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sADDED,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}"
Width="25"/>
<TextBlock Text="W"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sW,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}" Width="45"/>
<TextBlock Text="H"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sH,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}" Width="45"/>
<TextBlock Text="L"
Style="{StaticResource OptionTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sL,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}" Width="65"/>
Width="40"/>
</UniformGrid>
</Border>
<Border Grid.Column="1"
Background="{StaticResource Omag_White}"
Margin="10,20,30,0">
<UniformGrid Columns="6"
Margin="0,5,20,5">
<TextBlock Text="W"
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sW,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}" Width="45"/>
<TextBlock Text="H"
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sH,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}" Width="45"/>
<TextBlock Text="L"
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sL,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}},
UpdateSourceTrigger=Explicit}" Width="45"/>
</UniformGrid>
</Border>
<Border Grid.Row="1"
Background="{StaticResource Omag_White}"
Margin="15,10,-180,20">
<UniformGrid Columns="11"
Margin="0,0,-200,0">
<TextBlock Text="Inverti"
Style="{StaticResource OptionTextBlock}"
Style="{StaticResource OptionTextBlock_OnlyProd}"
Margin="10,0,0,0"/>
<Image IsEnabled="{Binding Tag.bLockInversion,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
@@ -43,66 +70,69 @@
Stretch="Uniform"
Visibility="{Binding Lock_Visibility}"
Style="{StaticResource LockImage}"/>
<Button Command="{Binding Tag.Invert_Command,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Style="{StaticResource ToolBar_SmallButton}"
Margin="5,0,0,0">
Margin="35,0,0,0">
<Image Source="/Resources/PartManager/LeftInvert.png" Stretch="Uniform"/>
</Button>
<TextBlock Text="{Binding Tag.sINVERTED,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
TextAlignment="Center"
Width="25"
Style="{StaticResource OptionTextBlock}"/>
Width="60"
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<Button Command="{Binding Tag.Invert_Command,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Style="{StaticResource ToolBar_SmallButton}"
Margin="0,0,5,0">
Margin="0,0,40,0">
<Image Source="/Resources/PartManager/RightInvert.png" Stretch="Uniform"/>
</Button>
<TextBlock Text="Ruota"
Style="{StaticResource OptionTextBlock}"
Margin="10,0,0,0"/>
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<Image IsEnabled="{Binding Tag.bLockRotation,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Height="15"
Stretch="Uniform"
Visibility="{Binding Lock_Visibility}"
Style="{StaticResource LockImage}"/>
<Button Command="{Binding Tag.BackRotation_Command,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Style="{StaticResource ToolBar_SmallButton}"
Margin="5,0,0,0">
Margin="35,0,0,0">
<Image Source="/Resources/PartManager/LeftRotate.png" Stretch="Uniform"/>
</Button>
<TextBlock Text="{Binding Tag.sROTATED,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
TextAlignment="Center"
Width="25"
Style="{StaticResource OptionTextBlock}"/>
Width="60"
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<Button Command="{Binding Tag.ForwardRotation_Command,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Style="{StaticResource ToolBar_SmallButton}"
Margin="0,0,10,0">
Margin="0,0,40,0">
<Image Source="/Resources/PartManager/RightRotate.png" Stretch="Uniform"/>
</Button>
<TextBlock Text="{Binding Tag.sNAM,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Style="{StaticResource OptionTextBlock}"/>
</StackPanel>
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Right"
FlowDirection="RightToLeft">
<TextBlock Text="{Binding Tag.sUnitTime,
UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Width="45"
Style="{StaticResource OptionTextBlock}"/>
<Image Source="/Resources/PartManager/Clock.png"
Stretch="Uniform"
Height="15"/>
</StackPanel>
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
</UniformGrid>
</Border>
<Border Grid.Row="1"
Grid.Column="1"
Background="{StaticResource Omag_White}"
Margin="200,10,30,20">
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="0,0,5,0">
<TextBlock Text="{Binding Tag.sUnitTime,
UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartManagerV}}}"
Width="80"
Style="{StaticResource OptionTextBlock_OnlyProd}"/>
<Image Source="/Resources/PartManager/Clock.png"
Stretch="Uniform"
Height="15"/>
</StackPanel>
</Border>
</Grid>
EgtBEAMWALL.ViewerOptimizer/RawPartManager/OnlyProdRawPartManagerV.xaml
+3 -2
View File
@@ -1,8 +1,9 @@
<StackPanel x:Class="OnlyProdRawPartManagerV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Vertical"
HorizontalAlignment="Right"
Orientation="Horizontal"
HorizontalAlignment="Left"
Margin="30,1,0,1"
DataContext="{StaticResource RawPartManagerVM}">
<Button Command="{Binding ProduceRawPart_Command}"
EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
+10 -7
View File
@@ -3,15 +3,18 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border BorderThickness="2" Grid.RowSpan="2" CornerRadius="4" BorderBrush="{StaticResource BeamWall_Glacier}" />
<EgtBEAMWALL:OnlyProdRawPartManagerV />
<EgtBEAMWALL:OnlyProdRawPartListV Grid.Column="1"
<EgtBEAMWALL:OnlyProdRawPartListV Grid.Row="1"
DataContext="{StaticResource RawPartListVM}"
Tag="{Binding Tag.MachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartManagerWndV}}}"/>
Tag="{Binding Tag.MachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartManagerWndV}}}"
Margin="0,0,2,0"/>
</Grid>
EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/OnlyProdShowBeamPanelV.xaml
+5 -4
View File
@@ -3,25 +3,26 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<Button Command="{Binding ShowAll_Command}"
IsEnabled="{Binding ShowAll_IsEnabled}"
ToolTip="{Binding ShowAll_ToolTip}"
Visibility="{Binding ShowAll_Visibility}"
Style="{StaticResource ToolBar_Button}">
Style="{StaticResource ToolBar_Button}"
Margin="5,2,5,2">
<Image Source="/Resources/ShowBeamPanel/ShowAll.png" Stretch="Uniform"/>
</Button>
<ToggleButton IsChecked="{Binding ShowSolid_IsChecked}"
IsEnabled="{Binding ShowSolid_IsEnabled}"
ToolTip="{Binding ShowSolid_ToolTip}"
Style="{StaticResource ToolBar_ToggleButton}">
Style="{StaticResource ToolBarOnlyProd_ToggleButton}">
<Image Source="/Resources/ShowBeamPanel/ShowSolid.png" Stretch="Uniform"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowBuilding_IsChecked}"
IsEnabled="{Binding ShowBuilding_IsEnabled}"
ToolTip="{Binding ShowBuilding_ToolTip}"
Style="{StaticResource ToolBar_ToggleButton}">
Style="{StaticResource ToolBarOnlyProd_ToggleButton}">
<Image Source="/Resources/ShowBeamPanel/ShowBuilding.png" Stretch="Uniform"/>
</ToggleButton>
EgtBEAMWALL.ViewerOptimizer/ShowPanel/OnlyProdShowPanelV.xaml
+4 -4
View File
@@ -3,20 +3,20 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource ToolBarOnlyProd_ToggleButton}"
IsChecked="{Binding WireframeIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingHLToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource ToolBarOnlyProd_ToggleButton}"
IsChecked="{Binding HiddenLineIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingSHToolTip}"
Style="{StaticResource ToolBar_ToggleButton}"
Style="{StaticResource ToolBarOnlyProd_ToggleButton}"
IsChecked="{Binding ShadingIsChecked}">
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
</RadioButton>
EgtBEAMWALL.ViewerOptimizer/SpecialPanel/OnlyProdSpecialPanelV.xaml
+2 -2
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<ItemsControl ItemsSource="{Binding ButtonList}">
<ItemsControl.ItemsPanel>
@@ -13,7 +13,7 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}"
<Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButtonOnlyProd}"
Visibility="{Binding Btn_Visibility}" IsEnabled="{Binding Btn_IsEnabled}">
<Image Source="{Binding ImagePath}"/>
</Button>
EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/OnlyProdStatisticsTimePanelV.xaml
+10 -10
View File
@@ -17,8 +17,8 @@
VerticalAlignment="Center"
Visibility="{Binding ViewPage_Visibility}">
<TextBlock Text="{Binding Tag.BTLStructureVM.sBTLTotTime, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsTimePanelV}}}"
FontSize="19"
Foreground="{StaticResource Omag_White}"
FontSize="30"
Foreground="{StaticResource BeamWall_White}"
VerticalAlignment="Center"/>
</Border>
<Border BorderThickness="2"
@@ -26,12 +26,12 @@
BorderBrush="{StaticResource BeamWall_Kashmir}"
Background="{StaticResource BeamWall_Kashmir}"
Padding="20,2,20,2"
Margin="2"
Margin="2,2,20,2"
VerticalAlignment="Center"
Visibility="{Binding MachiningPage_Visibility}">
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsTimePanelV}}}"
FontSize="20"
Foreground="{StaticResource Omag_White}"
FontSize="30"
Foreground="{StaticResource BeamWall_White}"
VerticalAlignment="Center"/>
</Border>
<Border BorderThickness="2"
@@ -39,12 +39,12 @@
BorderBrush="{StaticResource BeamWall_FruitSalad}"
Background="{StaticResource BeamWall_FruitSalad}"
Padding="20,2,20,2"
Margin="2"
Margin="2,2,20,2"
VerticalAlignment="Center"
Visibility="{Binding MachiningPage_Visibility}">
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sDoneTime, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsTimePanelV}}}"
FontSize="19"
Foreground="{StaticResource Omag_White}"
FontSize="30"
Foreground="{StaticResource BeamWall_White}"
VerticalAlignment="Center"/>
</Border>
<Border BorderThickness="2"
@@ -56,8 +56,8 @@
VerticalAlignment="Center"
Visibility="{Binding MachiningPage_Visibility}">
<TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsTimePanelV}}}"
FontSize="19"
Foreground="{StaticResource Omag_White}"
FontSize="30"
Foreground="{StaticResource BeamWall_White}"
VerticalAlignment="Center"/>
</Border>
EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml
+16 -5
View File
@@ -27,16 +27,27 @@
<ColumnDefinition Width="{Binding GridDims[9].GridLen, Mode=TwoWay}"/>
</Grid.ColumnDefinitions>
<EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}"
Tag="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
<Border BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="2"
CornerRadius="4">
<EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}"
Tag="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"
Margin="0,0,2,0"/>
</Border>
<GridSplitter Grid.Column="1"
Height="3"
HorizontalAlignment="Stretch"/>
<EgtBEAMWALL:OnlyProdQParameterListProdV Grid.Column="2"
DataContext="{StaticResource DuploQParameterListVM}"
Tag="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
<Border Grid.Column="2"
Margin="1,0,0,0"
BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="2" CornerRadius="4">
<EgtBEAMWALL:OnlyProdQParameterListProdV DataContext="{StaticResource DuploQParameterListVM}"
Tag="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
</Border>
</Grid>
<TextBlock Grid.Row="1"
Text="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"
EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml
+22 -9
View File
@@ -10,9 +10,9 @@
<EgtBEAMWALL:OnlyProdFreeContourInputV DataContext="{StaticResource FreeContourInputVM}"
Visibility="{Binding Tag.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>
<EgtBEAMWALL:OnlyProdPartManagerV DataContext="{StaticResource PartManagerVM}"
<!--<EgtBEAMWALL:OnlyProdPartManagerV DataContext="{StaticResource PartManagerVM}"
Tag="{Binding Tag.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
Visibility="{Binding Tag.PartManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>
Visibility="{Binding Tag.PartManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>-->
<Grid Grid.Row="1">
@@ -28,11 +28,14 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border BorderThickness="2" Grid.RowSpan="2" CornerRadius="4" BorderBrush="{StaticResource BeamWall_Glacier}" />
<EgtBEAMWALL:OnlyProdFeatureListManagerV />
<EgtBEAMWALL:OnlyProdFeatureListV DataContext="{StaticResource FeatureListVM}"
Tag="{Binding Tag.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
Grid.Row="1"/>
Grid.Row="1"
Margin="2,0,2,0"/>
</Grid>
<GridSplitter Grid.Column="1"
@@ -52,16 +55,26 @@
Margin="5,5,2.5,5">
<TabItem Header="P">
<TabItem.Content>
<EgtBEAMWALL:OnlyProdPParameterListV DataContext="{StaticResource PParameterListVM}"
Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
Margin="5"/>
<Border BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="2"
CornerRadius="4">
<EgtBEAMWALL:OnlyProdPParameterListV DataContext="{StaticResource PParameterListVM}"
Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
Margin="5"/>
</Border>
</TabItem.Content>
</TabItem>
<TabItem Header="Q">
<TabItem.Content>
<EgtBEAMWALL:OnlyProdQParameterListV DataContext="{StaticResource QParameterListVM}"
Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
Margin="5"/>
<Border BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="2"
CornerRadius="4">
<EgtBEAMWALL:OnlyProdQParameterListV DataContext="{StaticResource QParameterListVM}"
Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
Margin="5"/>
</Border>
</TabItem.Content>
</TabItem>
</TabControl>
EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb
+2 -2
View File
@@ -327,8 +327,8 @@ Public Module CurrentMachine
' aggiorno parametro in gestore viste
Core.ViewPanelVM.UpdateMachParam(m_nViewDir)
' carico valori default opzioni nesting
Map.refOptimizePanelVM.bLDIntersOther = GetMainPrivateProfileInt(S_NEST, K_LDINTERSOTHER, 0)
Map.refOptimizePanelVM.dMinScore = GetMainPrivateProfileInt(S_NEST, K_MINSCORE, 0)
'Map.refOptimizePanelVM.bLDIntersOther = GetMainPrivateProfileInt(S_NEST, K_LDINTERSOTHER, 0)
'Map.refOptimizePanelVM.dMinScore = GetMainPrivateProfileInt(S_NEST, K_MINSCORE, 0)
End If
End Sub
EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+256 -45
View File
@@ -74,7 +74,11 @@
<SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
<!--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}" />
<!--#C9DFF0-->
<Color x:Key="BeamWall_LinkWater_Color" R="201" G="223" B="240" A="255"/>
<SolidColorBrush x:Key="BeamWall_LinkWater" Color="{StaticResource BeamWall_LinkWater_Color}" />
@@ -123,6 +127,22 @@
<Color x:Key="BeamWall_Christine_Color" R="235" G="114" B="14" A="255"/>
<SolidColorBrush x:Key="BeamWall_Christine" Color="{StaticResource BeamWall_Christine_Color}" />
<!--#F48A3F-->
<Color x:Key="BeamWall_Jaffa_Color" R="244" G="138" B="63" A="255"/>
<SolidColorBrush x:Key="BeamWall_Jaffa" Color="{StaticResource BeamWall_Jaffa_Color}" />
<!--#FF9A3C-->
<Color x:Key="BeamWall_NeonCarrot_Color" R="255" G="154" B="60" A="255"/>
<SolidColorBrush x:Key="BeamWall_NeonCarrot" Color="{StaticResource BeamWall_NeonCarrot_Color}" />
<!--#FFB153-->
<Color x:Key="BeamWall_TexasRose_Color" R="255" G="177" B="83" A="255"/>
<SolidColorBrush x:Key="BeamWall_TexasRose" Color="{StaticResource BeamWall_TexasRose_Color}" />
<!--#656666-->
<Color x:Key="BeamWall_Corduroy_Color" R="101" G="102" B="102" A="255"/>
<SolidColorBrush x:Key="BeamWall_Corduroy" Color="{StaticResource BeamWall_Corduroy_Color}" />
<!--Colori per EgtWPFLib5-->
<SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
<!--Colori per TabHeader-->
@@ -152,12 +172,20 @@
<!-- Button Style -->
<SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
<SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
<SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
<SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
<SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
<SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
<!--#FFDDDDDD-->
<SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
<!--#FF707070-->
<SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
<!--#FF000000-->
<SolidColorBrush x:Key="Button.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
<!--#FFBEE6FD-->
<SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<!--#FF3C7FB1-->
<SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<!--#FFC4E5F6-->
<SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<!--#FF2C628B-->
<SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
<SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
<SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
@@ -165,17 +193,16 @@
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
<Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="Foreground" Value="{StaticResource Button.Static.Foreground}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Margin" Value="1"/>
<Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
<Setter Property="FontSize" Value="15"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true" CornerRadius="2">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
@@ -194,7 +221,6 @@
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
<Setter Property="OpacityMask" Value="#54707070"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@@ -211,10 +237,24 @@
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
</Style>
<Style x:Key="ToolBarViewPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="5,2,5,2"/>
</Style>
<Style x:Key="ToolBarOnlyProd_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="10,2.5,2.5,2.5"/>
</Style>
<Style x:Key="ToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="20"/>
<Setter Property="Width" Value="20"/>
</Style>
<Style x:Key="ToolBar_OnlyProdSmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="20"/>
<Setter Property="Width" Value="20"/>
</Style>
<Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="80"/>
@@ -335,7 +375,13 @@
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
</Style>
<Style x:Key="ToolBarOnlyProd_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="5,2,5,2"/>
</Style>
<Style x:Key="ToolBar_SmallToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
<Setter Property="Height" Value="20"/>
<Setter Property="Width" Value="20"/>
@@ -403,12 +449,16 @@
</Style.Triggers>
</Style>
<Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
</Style>
<Style x:Key="DrawPanelButtonOnlyProd" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="5,2,5,2"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -438,9 +488,16 @@
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Margin" Value="10,0,10,0"/>
</Style>
<Style x:Key="OptionTextBlock_OnlyProd" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontSize" Value="15"/>
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
</Style>
<Style x:Key="ListTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
@@ -478,11 +535,10 @@
<Style x:Key="OnlyProd_TextBlock" TargetType="{x:Type TextBlock}">
<Setter Property="TextAlignment" Value="Center" />
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
<!--<Setter Property="Margin" Value="2" />-->
<Style.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
<Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
</DataTrigger>
</Style.Triggers>
@@ -494,7 +550,7 @@
<Style.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
<Setter Property="Background" Value="{StaticResource BeamWall_YellowOrange}" />
</DataTrigger>
</Style.Triggers>
@@ -553,15 +609,19 @@
<!-- ScrollBar -->
<!--#F0F0F0-->
<SolidColorBrush x:Key="ScrollBar.Static.Background" Color="#FFFFFF"/>
<SolidColorBrush x:Key="ScrollBar.Static.Border" Color="#F0F0F0"/>
<SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
<!--#F0F0F0-->
<SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<!--#606060-->
<SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="#444444"/>
<SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<!--#CDCDCD-->
<SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="#DADADA"/>
<SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="#DADADA"/>
<SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="#000000"/>
<!--#DADADA-->
<SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
<!--#DADADA-->
<SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
<!--"#000000"-->
<SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
<!--#A6A6A6-->
<SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource BeamWall_Glacier_Color}"/>
<!--#606060-->
@@ -570,11 +630,15 @@
<SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<!--#606060-->
<SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="#FFFFFF"/>
<SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="#F0F0F0"/>
<SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="#F0F0F0"/>
<SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="#BFBFBF"/>
<SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="#FFFFFF"/>
<!--#000000-->
<SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
<!--#F0F0F0-->
<SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
<!--#F0F0F0-->
<SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
<!--#BFBFBF-->
<SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Glacier_Color}"/>
<SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
<Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="Background" Value="Transparent"/>
@@ -1017,6 +1081,148 @@
<Setter Property="Width" Value="100"/>
</Style>
<ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="17"/>
</Grid.ColumnDefinitions>
<Border x:Name="Border"
Grid.ColumnSpan="2"
CornerRadius="0"
Background="{StaticResource Omag_White}"
BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="1" />
<Border Grid.Column="0"
CornerRadius="0"
Margin="1"
Background="{StaticResource BeamWall_Glacier}"
BorderBrush="{StaticResource BeamWall_Glacier}"
BorderThickness="1" />
<Path x:Name="Arrow"
Grid.Column="1"
Fill="{StaticResource BeamWall_Glacier}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="M0,0 L0,2 L4,6 L8,2 L8,0 L4,4 z" />
</Grid>
</ControlTemplate>
<ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}">
<Border x:Name="PART_ContentHost" Focusable="False" Background="{TemplateBinding Background}" />
</ControlTemplate>
<Style x:Key="{x:Type ComboBox}" TargetType="{x:Type ComboBox}">
<Setter Property="SnapsToDevicePixels" Value="true"/>
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="Width" Value="60"/>
<Setter Property="Height" Value="25"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBox}">
<Grid>
<ToggleButton Name="ToggleButton"
Template="{StaticResource ComboBoxToggleButton}"
Grid.Column="2"
Focusable="false"
IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
ClickMode="Press">
</ToggleButton>
<ContentPresenter Name="ContentSite" IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}"
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
Margin="5,3,23,3"
VerticalAlignment="Center"
HorizontalAlignment="Left" />
<TextBox x:Name="PART_EditableTextBox"
Style="{x:Null}"
Template="{StaticResource ComboBoxTextBox}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Margin="3,3,23,3"
Focusable="True"
Background="#FF3F3F3F"
Foreground="Green"
Visibility="Hidden"
IsReadOnly="{TemplateBinding IsReadOnly}"/>
<Popup Name="Popup"
Placement="Bottom"
IsOpen="{TemplateBinding IsDropDownOpen}"
AllowsTransparency="True"
Focusable="False"
PopupAnimation="Slide">
<Grid Name="DropDown"
SnapsToDevicePixels="True"
MinWidth="{TemplateBinding ActualWidth}"
MaxHeight="{TemplateBinding MaxDropDownHeight}">
<Border x:Name="DropDownBorder"
Background="{StaticResource BeamWall_Glacier}"
BorderThickness="0"
BorderBrush="{StaticResource BeamWall_Glacier}"/>
<ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
</ScrollViewer>
</Grid>
</Popup>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="HasItems" Value="false">
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="#888888"/>
</Trigger>
<Trigger Property="IsGrouping" Value="true">
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
</Trigger>
<Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="true">
<Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0"/>
<Setter TargetName="DropDownBorder" Property="Margin" Value="0,0,0,0"/>
</Trigger>
<Trigger Property="IsEditable" Value="true">
<Setter Property="IsTabStop" Value="false"/>
<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible"/>
<Setter TargetName="ContentSite" Property="Visibility" Value="Hidden"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
</Style.Triggers>
</Style>
<!-- SimpleStyles: ComboBoxItem -->
<Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
<Setter Property="SnapsToDevicePixels" Value="true"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBoxItem}">
<Border Name="Border"
Padding="2"
SnapsToDevicePixels="true">
<ContentPresenter />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsHighlighted" Value="true">
<Setter TargetName="Border" Property="Background" Value="{StaticResource ResourceKey=BeamWall_Kashmir}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="#888888"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- CheckBox -->
@@ -1136,10 +1342,10 @@
<Style x:Key="DataGrid_OnlyProd" TargetType="{x:Type DataGrid}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
<!--#FF688CAF-->
<Setter Property="BorderBrush" Value="#749FC4"/>
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Glacier}"/>
<Setter Property="BorderThickness" Value="0,0,0,0"/>
<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="Both"/>
@@ -1149,7 +1355,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGrid}">
<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True" CornerRadius="4">
<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
<ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
<ScrollViewer.Template>
<ControlTemplate TargetType="{x:Type ScrollViewer}">
@@ -1195,6 +1401,7 @@
</Style.Triggers>
</Style>
<Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
<Style.Resources>
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
@@ -1206,14 +1413,14 @@
<Trigger Property="IsSelected" Value="True">
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
<Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
<Setter Property="Height" Value="20" />
<Setter Property="Height" Value="23" />
<Style.Resources>
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
@@ -1224,14 +1431,13 @@
<Trigger Property="IsSelected" Value="True">
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
<Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="RowDataGrid_CustomHighLight_PartList" TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="20" />
<Style.Resources>
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
@@ -1242,13 +1448,14 @@
<Trigger Property="IsSelected" Value="True">
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_YellowOrange}" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
<Setter Property="Background" Value="{StaticResource BeamWall_YellowOrange}" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="CellDataGrid_CustomHighLight_PartList" TargetType="{x:Type DataGridCell}">
<Setter Property="Height" Value="23" />
<Style.Resources>
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
@@ -1259,7 +1466,7 @@
<Trigger Property="IsSelected" Value="True">
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_YellowOrange}" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{StaticResource Omag_White}" />
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
<Setter Property="Background" Value="{StaticResource BeamWall_YellowOrange}" />
</Trigger>
</Style.Triggers>
@@ -1375,12 +1582,16 @@
<SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="#FFFFFF"/>
<!--#333333-->
<SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
<SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="#5593FF"/>
<!--#5593FF-->
<SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="#F3F9FF"/>
<SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="#000000"/>
<SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="#3C77DD"/>
<!--#000000-->
<SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<!--#3C77DD-->
<SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="#D9ECFF"/>
<SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="#000000"/>
<!--#000000-->
<SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
<SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="#BCBCBC"/>
<SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="#E6E6E6"/>
<SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#707070"/>
@@ -1589,7 +1800,7 @@
</Setter>
</Style>
<Style TargetType="{x:Type Expander}">
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
@@ -1649,7 +1860,7 @@
<!--#a826A0Da-->
<SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
<!--#000000-->
<SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="White"/>
<SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
<!--#3D26A0DA-->
<SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
<!--#FF26A0DA-->
EgtBEAMWALL.ViewerOptimizer/ViewPanel/OnlyProdViewPanelV.xaml
+8 -8
View File
@@ -3,40 +3,40 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<Button ToolTip="{Binding ZoomAllToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding ZoomAllCommand}">
<Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromTopToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding TopViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromFrontToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding FrontViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromRightToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding RightViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromBackToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding BackViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromLeftToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding LeftViewCommand}">
<Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromIso_SWToolTip}"
Style="{StaticResource ToolBar_Button}"
Style="{StaticResource ToolBarViewPanel_Button}"
Command="{Binding IsoViewSWCommand}">
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
</Button>
EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
+27 -12
View File
@@ -206,16 +206,27 @@
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"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
ColumnHeaderForeground="{StaticResource Omag_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
ColumnHeaderFontSize="15"
ColumnHeaderPadding="0,2,0,2"
BindingColumns="{Binding SParamColumns}"
Style="{StaticResource DataGrid_OnlyProd}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
RowStyle="{StaticResource RowDataGrid_CustomHighLight}">
<DataGrid.Resources>
<!-- Active -->
<DataGridTemplateColumn x:Key="colACTIVE">
@@ -236,15 +247,19 @@
</DataTemplate>
</DataGridComboBoxColumn.HeaderTemplate>
<DataGridComboBoxColumn.ElementStyle>
<Style TargetType="ComboBox">
<Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALL:OnlyProdWarehouseWndV}}, Path=DataContext.SectionXMaterialList}"/>
<Setter Property="SelectedItem" Value="{Binding SectXMat, UpdateSourceTrigger=PropertyChanged}" />
<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
<Setter Property="Width" Value="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
</Style>
</DataGridComboBoxColumn.ElementStyle>
<DataGridComboBoxColumn.EditingElementStyle>
<Style TargetType="ComboBox">
<Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
<Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALL:OnlyProdWarehouseWndV}}, Path=DataContext.SectionXMaterialList}"/>
<Setter Property="SelectedItem" Value="{Binding SectXMat, UpdateSourceTrigger=PropertyChanged}" />
<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
<Setter Property="Width" Value="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
</Style>
</DataGridComboBoxColumn.EditingElementStyle>
</DataGridComboBoxColumn>