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

-aggiunto stile tooltip, listbox

Browse Source
This commit is contained in:
Demetrio Cassarino
2024-05-31 15:29:46 +02:00
parent 80f06890c4
commit f8a9eb544d
17 changed files with 249 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml
+3 -3
View File
@@ -34,13 +34,13 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<Expander IsExpanded="True">
<Expander IsExpanded="True" Style="{x:Null}">
<Expander.Background>
<SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
</Expander.Background>
<Expander.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Path=Name}" />
<TextBlock Text="{Binding Path=Name}"/>
</StackPanel>
</Expander.Header>
<ItemsPresenter />
@@ -57,7 +57,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<Expander IsExpanded="True">
<Expander IsExpanded="True" Style="{x:Null}">
<Expander.Background>
<SolidColorBrush Color="LightGray"></SolidColorBrush>
</Expander.Background>
EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml
+20 -13
View File
@@ -11,14 +11,16 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
Margin="0,0,0,5"
Style="{StaticResource DataGrid_OnlyProd}">
Style="{StaticResource DataGrid_OnlyProd}"
RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
<DataGrid.Columns>
<!--BWType-->
<DataGridTextColumn Binding="{Binding sBWType}"
Width="40"
IsReadOnly="True">
Width="40"
IsReadOnly="True"
Foreground="{StaticResource BeamWall_Corduroy}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -27,8 +29,9 @@
</DataGridTextColumn>
<!--Nome-->
<DataGridTextColumn Binding="{Binding sName}"
Width="50"
IsReadOnly="True">
Width="50"
IsReadOnly="True"
Foreground="{StaticResource BeamWall_Corduroy}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -37,8 +40,9 @@
</DataGridTextColumn>
<!--Descrizione-->
<DataGridTextColumn Binding="{Binding sDescription}"
Width="1*"
IsReadOnly="True">
Width="1*"
IsReadOnly="True"
Foreground="{StaticResource BeamWall_Corduroy}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -47,7 +51,8 @@
</DataGridTextColumn>
<!--Default-->
<DataGridTextColumn Binding="{Binding sDefault}"
Width="65">
Width="65"
Foreground="{StaticResource BeamWall_Corduroy}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -56,8 +61,9 @@
</DataGridTextColumn>
<!--Minimo-->
<DataGridTextColumn Binding="{Binding sMin}"
Width="65"
IsReadOnly="True">
Width="65"
IsReadOnly="True"
Foreground="{StaticResource BeamWall_Corduroy}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -66,8 +72,9 @@
</DataGridTextColumn>
<!--Massimo-->
<DataGridTextColumn Binding="{Binding sMax}"
Width="65"
IsReadOnly="True">
Width="65"
IsReadOnly="True"
Foreground="{StaticResource BeamWall_Corduroy}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
EgtBEAMWALL.ViewerOptimizer/BTLDataWnd/BTLDataWndV.xaml
+46 -46
View File
@@ -3,7 +3,6 @@
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"
@@ -11,148 +10,149 @@
IsMinimizable="False"
IsResizable="False"
Title="BTLDataWndV"
Name="BTLDataWndV">
Name="BTLDataWndV"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<UniformGrid Margin="5"
Columns="6" Rows="7">
<TextBlock Text="{Binding PROJNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROJNAME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROJPART_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROJGUID_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding LISTNAME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding CUSTOMER_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ARCHITECT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EDITOR_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding DELIVDATE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPDATE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPTIME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPRELEASE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding LANGUAGE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding RANGE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
Path=Tag.ocRANGE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
Path=Tag.SelRANGE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
Path=Tag.ocPROCESSINGQUALITY,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
Path=Tag.SelPROCESSINGQUALITY,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding COMPUTERNAME_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding USER_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding SRCFILE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding EXPFILE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding RECESS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
Path=Tag.ocRECESS,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
Path=Tag.SelRECESS,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding USERATTRIBUTE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml
+2 -1
View File
@@ -121,7 +121,8 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center"/>
VerticalAlignment="Center"
HorizontalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
+10 -2
View File
@@ -84,7 +84,11 @@ Public Class BTLStructureVM
Select Case m_SelectionType
Case SelectionTypes.SELECT_
' imposto modalita' proj su vista feature
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProdProjManagerVM.SelProdProj = ProdProj.PROJ
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refProdProjManagerVM.SelProdProj = ProdProj.PROJ
' rendo visibile PartManager
Map.refLeftPanelVM.OnlyProdPartManagerVisibility = Visibility.Visible
End If
' rendo enable bottone parameters
Map.refLeftPanelVM.SetParametersIsEnabled(True)
Map.refLeftPanelVM.SetData_IsEnabled(False)
@@ -97,7 +101,11 @@ Public Class BTLStructureVM
Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
Case SelectionTypes.HIGHLIGHT
' imposto modalita' nulla su vista feature
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
' rendo visibile PartManager
Map.refLeftPanelVM.OnlyProdPartManagerVisibility = Visibility.Collapsed
End If
' rendo disable bottone parameters
Map.refLeftPanelVM.SetParametersIsEnabled(False)
Map.refLeftPanelVM.SetData_IsEnabled(True)
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
+1 -1
View File
@@ -78,7 +78,7 @@
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPParameterListV.xaml
+1 -1
View File
@@ -67,7 +67,7 @@
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListProdV.xaml
+1 -1
View File
@@ -69,7 +69,7 @@
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
+1 -1
View File
@@ -69,7 +69,7 @@
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
+7 -2
View File
@@ -54,10 +54,15 @@ Public Class LeftPanelVM
NotifyPropertyChanged(NameOf(Data_IsEnabled))
End Sub
Public ReadOnly Property InstrumentButton_Visibilty As Visibility
Private m_OnlyProdPartManagerVisibility As Visibility = Visibility.Collapsed
Public Property OnlyProdPartManagerVisibility As Visibility
Get
Return If(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
Return m_OnlyProdPartManagerVisibility
End Get
Set(value As Visibility)
m_OnlyProdPartManagerVisibility = value
NotifyPropertyChanged(NameOf(OnlyProdPartManagerVisibility))
End Set
End Property
' Definizione comandi
EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+4 -4
View File
@@ -15,7 +15,8 @@
<ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
DisplayMemberPath="sSectionXMaterial"
Style="{StaticResource OnlyProdLeftPanel_ListBox}"/>
Style="{StaticResource OnlyProdLeftPanel_ListBox}"
ItemContainerStyle="{StaticResource AlternatingWithTriggers}"/>
</Expander>
<Expander Grid.Column="1"
Header="{Binding Group_Msg}"
@@ -57,14 +58,12 @@
<Button Command="{Binding Data_Command}"
ToolTip="{Binding Data_ToolTip}"
IsEnabled="{Binding Data_IsEnabled}"
Visibility="{Binding InstrumentButton_Visibilty}"
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 OnlyProdLeftPanel_Button}">
<Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
</Button>
@@ -80,6 +79,7 @@
<EgtBEAMWALL:OnlyProdPartManagerV Grid.Row="2"
DataContext="{StaticResource PartManagerVM}"
Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"/>
Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
Visibility="{Binding DataContext.OnlyProdPartManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"/>
</Grid>
EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
+2 -1
View File
@@ -43,7 +43,8 @@
Visibility="{Binding DataContext.OnlyProdLeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<GridSplitter Grid.Column="1"
Style="{StaticResource Width_GridSplitter}"/>
Style="{StaticResource Width_GridSplitter}"
Background="Transparent"/>
<Grid Grid.Column="2">
<Grid.RowDefinitions>
EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelVM.vb
-5
View File
@@ -258,11 +258,6 @@ Public Class OptimizePanelVM
' se vista tutti i pezzi
Dim bShowBuilding As Boolean = False
Configuration.ShowAllPieces(bShowBuilding)
'If Map.refShowBeamPanelVM.bShowAll Then
' ' verifico se assemblato e lo annullo per salvataggio
' bShowBuilding = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
' If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
'End If
Dim NestingRunningWndVM As New NestingRunningWndVM(m_SelPartType.Id, BTLPart)
Dim NestingRunningWnd As New NestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
NestingRunningWnd.ShowDialog()
EgtBEAMWALL.ViewerOptimizer/PartParametersWnd/PartParametersWndV.xaml
+125 -125
View File
@@ -3,7 +3,6 @@
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"
@@ -11,7 +10,8 @@
IsMinimizable="False"
IsResizable="False"
Title="PartParametersWndV"
Name="PartParametersWndV">
Name="PartParametersWndV"
Style="{StaticResource OnlyProd_EgtCustomWindow}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -25,73 +25,73 @@
<UniformGrid Columns="2" Margin="0,0,0,-45">
<TextBlock Text="{Binding NAM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding COUNT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ORDERNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PLANINGLEN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding STARTOFFSET_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ENDOFFSET_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding DESIGN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding GROUP_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding STOREY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ANNOT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding MATERIAL_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="1" Margin="0,55">
<GroupBox Grid.Row="1" Style="{DynamicResource GroupBoxStyle_NoHeader}" Margin="0,55">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -101,24 +101,24 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding COLOUR_MSG}"
Grid.Row="0"
Style="{StaticResource PartParam_TextBlock}"/>
<Button Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
<TextBlock Grid.Row="0"
Text="{Binding COLOUR_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<Button Grid.Row="0"
Grid.Column="1"
Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="0"
Grid.Column="1"
Width="100"
Style="{StaticResource ToolBar_SmallButton}"/>
<TextBlock Text="{Binding TRANSPARENCY_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding TRANSPARENCY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
@@ -126,85 +126,85 @@
<UniformGrid Grid.Column="1" Columns="2" Margin="0,0,0,-45">
<TextBlock Text="{Binding TIMBERGRADE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding QUALITYGRADE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PACKAGE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding ELEMENTNUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding MODULENUM_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocPROCESSINGQUALITY,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelPROCESSINGQUALITY,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding RECESS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocRECESS,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelRECESS,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding STOREYTYPE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocSTOREYTYPE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelSTOREYTYPE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding LAYER_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding COMMENT_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
</UniformGrid>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="1" Grid.Column="1" Margin="0,55">
<GroupBox Grid.Row="1" Grid.Column="1" Style="{DynamicResource GroupBoxStyle_NoHeader}" Margin="0,55">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -216,24 +216,24 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding REFSIDE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocREFSIDE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelREFSIDE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding REFSIDEALIGN_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding REFSIDEALIGN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<CheckBox Grid.Row="1"
Grid.Column="1"
IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.bREFSIDEALIGN,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Grid.Row="1"
Grid.Column="1"/>
VerticalAlignment="Center"/>
</Grid>
</GroupBox>
@@ -259,7 +259,7 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
<GroupBox Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -271,24 +271,24 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding GRAINDIRECTION_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Column="1"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding GRAINDIRALIGN_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding GRAINDIRALIGN_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<CheckBox Grid.Row="1"
Grid.Column="1"
IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.bGRAINDIRALIGN,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Grid.Row="1"
Grid.Column="1"
Margin="0,5"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="2" Grid.RowSpan="2" Grid.ColumnSpan="2">
<GroupBox Grid.Row="2" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -300,25 +300,25 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding CAMBERSIDE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocCAMBERSIDE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelCAMBERSIDE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding CAMBERPARAMS_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding CAMBERPARAMS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="4" Grid.RowSpan="2" Grid.ColumnSpan="2">
<GroupBox Grid.Row="4" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -330,25 +330,25 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding REFSIDEFIXCLAMP_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocREFSIDEFIXCLAMP,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelREFSIDEFIXCLAMP,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding PARTOFFSETPARAMS_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding PARTOFFSETPARAMS_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="6" Grid.RowSpan="2" Grid.ColumnSpan="2">
<GroupBox Grid.Row="6" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -360,25 +360,25 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding MATERIALTYPEGRP_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocMATERIALTYPEGRP,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelMATERIALTYPEGRP,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding MATERIALTYPESPEC_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding MATERIALTYPESPEC_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="8" Grid.RowSpan="2" Grid.ColumnSpan="2">
<GroupBox Grid.Row="8" Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -390,30 +390,30 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ALIGNLOCATION_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocALIGNLOCATION,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelALIGNLOCATION,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding ALIGNENDTYPE_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding ALIGNENDTYPE_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Row="1"
Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocALIGNENDTYPE,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelALIGNENDTYPE,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Row="1"
Grid.Column="1"
Margin="0,5"
Style="{StaticResource PartParam_ComboBox}"/>
</Grid>
</GroupBox>
<GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="10" Grid.RowSpan="4" Grid.ColumnSpan="2">
<GroupBox Grid.Row="10" Grid.RowSpan="4" Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_NoHeader}">
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -427,37 +427,37 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding UID_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
<ComboBox Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.ocUID,
Mode=OneWay}"
SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}},
Path=Tag.SelUID,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
Style="{StaticResource PartParam_ComboBox}"/>
<TextBlock Text="{Binding TRANSFORIG_MSG}"
Grid.Row="1"
<TextBlock Grid.Row="1"
Text="{Binding TRANSFORIG_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="1"
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding TRANSFVERSX_MSG}"
Grid.Row="2"
<TextBlock Grid.Row="2"
Text="{Binding TRANSFVERSX_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="2"
<EgtWPFLib5:EgtTextBox Grid.Row="2"
Grid.Column="1"
Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
<TextBlock Text="{Binding TRANSFVERSY_MSG}"
Grid.Row="3"
<TextBlock Grid.Row="3"
Text="{Binding TRANSFVERSY_MSG}"
Style="{StaticResource PartParam_TextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Grid.Row="3"
<EgtWPFLib5:EgtTextBox Grid.Row="3"
Grid.Column="1"
Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersWndV}}}"
Style="{StaticResource PartParam_TextBox}"/>
</Grid>
</GroupBox>
EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml
+2 -2
View File
@@ -50,7 +50,7 @@
Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>
<TabControl Grid.Row="1"
Style="{StaticResource OnlyProd_TabControl}">
<TabItem Header="P">
<TabItem Header="Parametri Geometrici">
<TabItem.Content>
<Border Style="{StaticResource OnlyProdPage_Border}">
@@ -60,7 +60,7 @@
</Border>
</TabItem.Content>
</TabItem>
<TabItem Header="Q">
<TabItem Header="Parametri di Lavorazione">
<TabItem.Content>
<Border Style="{StaticResource OnlyProdPage_Border}">
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
+22 -2
View File
@@ -1807,7 +1807,7 @@
<!--#region ToolTip-->
<Style TargetType="{x:Type ToolTip}">
<Style x:Key="OnlyProd_ToolTip" TargetType="{x:Type ToolTip}">
<Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
</Style>
@@ -3074,7 +3074,8 @@
- ProjWnd per TabControl -->
<Style x:Key="OnlyProd_TabControl" TargetType="{x:Type TabControl}">
<Setter Property="TabStripPlacement" Value="Left"/>
<Setter Property="TabStripPlacement" Value="Top"/>
<Setter Property="FlowDirection" Value="RightToLeft"/>
<Setter Property="Margin" Value="5,5,2.5,5"/>
</Style>
@@ -3377,8 +3378,27 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="Height" Value="200"/>
<Setter Property="Width" Value="130"/>
<Setter Property="AlternationCount" Value="2"/>
<Style.Resources>
<Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
</Style.Resources>
</Style>
<Style x:Key="AlternatingWithTriggers" TargetType="{x:Type ListBoxItem}">
<Style.Triggers>
<Trigger Property="ListBox.AlternationIndex" Value="1">
<Setter Property="Background" Value="{StaticResource BeamWall_LinkWater}"/>
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
</Trigger>
<!--<Trigger Property="IsSelected" Value="True">
<Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontSize" Value="14"/>
</Trigger>-->
</Style.Triggers>
</Style>
<!-- Stile utilizzato nella classe:
- OnlyProdWarehouseWndV per ListBox SParamList -->