Merge branch 'feature/NewGraphicsProgram' of https://gitlab.steamware.net/egaltech/egtbeamwall into feature/NewGraphicsProgram
This commit is contained in:
@@ -278,7 +278,8 @@
|
||||
<Button Command="{Binding ResetCalc_Command}"
|
||||
ToolTip="{Binding ResetCalc_ToolTip}"
|
||||
IsEnabled="{Binding CALCPanel_IsEnabled}"
|
||||
Style="{StaticResource ToolBarViewPanel_Button}">
|
||||
Width="20" Height="20"
|
||||
Style="{StaticResource OnlyProdLeftPanel_Button}">
|
||||
<Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
|
||||
|
||||
@@ -280,6 +280,12 @@ Public Class PartVM
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public ReadOnly Property sPOSY_Visibility As Visibility
|
||||
Get
|
||||
Return If(Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM, Visibility.Collapsed, Visibility.Visible)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdBackRotation As ICommand
|
||||
Private m_cmdForwardRotation As ICommand
|
||||
|
||||
@@ -110,6 +110,7 @@
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<WrapPanel Width="{Binding ActualWidth, ElementName=TOPTRAY}"
|
||||
Style="{StaticResource OnlyProdProject_WrapPanel}">
|
||||
@@ -120,10 +121,11 @@
|
||||
<EgtBEAMWALL:OnlyProdViewPanelV TitleBarOrientation="Vertical" DataContext="{StaticResource ViewPanelVM}"/>
|
||||
</WrapPanel>
|
||||
|
||||
<EgtBEAMWALL:OnlyProdFeatureListV Grid.Column="1"
|
||||
DataContext="{StaticResource FeatureListVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
|
||||
<EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV Grid.Column="1"
|
||||
DataContext="{StaticResource FeatureInPartInRawPartListVM}"
|
||||
Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
|
||||
|
||||
<TextBlock Grid.Column="2" Width="200" Text="LOG FILE"/>
|
||||
</Grid>
|
||||
|
||||
<EgtBEAMWALL:SceneHostV Grid.Row="3"/>
|
||||
|
||||
Reference in New Issue
Block a user