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

-pulizia codice

Browse Source 
-aggiunto finestra OnlyProd_QParamListV, OnlyProdAxesPanelV, OnlyProdCalcPanelV, OnlyProdPartInRawPartListV, OnlyProdRawPartListV, OnlyProdLeftPanelV, OnlyProdProjectV, OnlyProdShowPanelV, OnlyProdSupervisorManagerV, OnlyProdViewPanelV, OnlyProdMainMenuV
This commit is contained in:
Demetrio Cassarino
2024-06-05 16:13:18 +02:00
parent f8a9eb544d
commit 651c1e32af
53 changed files with 2636 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
+20 -18
View File
@@ -12,9 +12,10 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
<StackPanel Margin="5,5,5,0">
<GroupBox Header="{Binding CurrentLanguage_Msg}"
Margin="0,0,0,5">
Margin="0,0,0,5"
Foreground="{StaticResource BeamWall_Corduroy}">
<UniformGrid Rows="2" Margin="3,3,3,3">
<ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
@@ -25,37 +26,38 @@
</GroupBox>
<UniformGrid Columns="2"
Margin="0,0,0,5">
<TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
<ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
SelectedIndex="{Binding SelMeasureUnit}" Height="25"
Margin="0,5,0,0" Style="{StaticResource OnlyProd_ComboBox}" />
</UniformGrid>
<GroupBox Header="{Binding Nesting_Msg}"
Margin="0,0,0,5">
Margin="0,0,0,5"
Foreground="{StaticResource BeamWall_Corduroy}">
<StackPanel>
<UniformGrid Columns="2"
Margin="0,0,0,5">
<TextBlock Text="{Binding SectionTime_Msg}"
Grid.Row="0" Grid.Column="0"/>
<EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
Grid.Row="0" Grid.Column="1"/>
<TextBlock Text="{Binding SectionTime_Msg}"/>
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
</UniformGrid>
<UniformGrid Columns="2"
Margin="0,0,0,5">
<TextBlock Text="{Binding PartTime_Msg}"
Grid.Row="1" Grid.Column="0"/>
<EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
Grid.Row="1" Grid.Column="1"/>
<TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
<EgtWPFLib5:EgtTextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"/>
</UniformGrid>
</StackPanel>
</GroupBox>
<UniformGrid Columns="2"
Margin="0,0,0,5">
<TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
<CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
Margin="0,5,0,0"/>
</UniformGrid>
<GroupBox Header="Backup And Restore">
<GroupBox Header="Backup And Restore"
Foreground="{StaticResource BeamWall_Corduroy}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -63,8 +65,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0"
Margin="0,2,0,5">
<Grid Margin="0,2,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
@@ -107,10 +108,11 @@
Orientation="Horizontal">
<Button Content="Backup"
Command="{Binding Backup_Command}"
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
Margin="0,0,5,0"/>
<Button Content="Restore"
Command="{Binding Restore_Command}"
Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
</StackPanel>
</Grid>
</GroupBox>
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml
+10 -11
View File
@@ -13,13 +13,13 @@
<RowDefinition Height="10*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
<EgtBEAMWALL:OnlyProdMachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
</GroupBox>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
<StackPanel Grid.Row="1" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
<ItemsControl ItemsSource="{Binding ConfigMachTableList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
@@ -28,7 +28,7 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto">
<GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto" Foreground="{StaticResource BeamWall_Corduroy}">
<ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
@@ -48,15 +48,15 @@
TextWrapping="WrapWithOverflow"
Width="190"
Style="{StaticResource MachParamTextBlock}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
Grid.Column="1"
<EgtWPFLib5:EgtTextBox Grid.Column="1"
Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
Width="60"/>
<TextBlock Text="{Binding sDescription}"
<TextBlock Grid.Column="2"
Text="{Binding sDescription}"
ToolTip="{Binding sDescription}"
TextWrapping="WrapWithOverflow"
Width="185"
Style="{StaticResource MachParamTextBlock}"
Grid.Column="2"/>
Style="{StaticResource MachParamTextBlock}"/>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -67,9 +67,8 @@
</ItemsControl>
</StackPanel>
<Button Command="{Binding SaveCommand}"
Grid.Column="0"
Grid.Row="1"
<Button Grid.Row="1"
Command="{Binding SaveCommand}"
ToolTip="{Binding SaveToolTip}"
Visibility="{Binding Machine_Visibility}"
Style="{StaticResource SaveMachinePanel_Button}">
EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml
+6 -7
View File
@@ -10,10 +10,9 @@
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<EgtBEAMWALL:QParamListV DataContext="{Binding}"
<EgtBEAMWALL:OnlyProd_QParamListV DataContext="{Binding}"
ItemsSource="{Binding QBTLParamVMList}"
SelectedItem="{Binding SelQParam}"
Grid.Column="0"
Margin="5">
<DataGrid.GroupStyle>
<GroupStyle>
@@ -34,9 +33,9 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<Expander IsExpanded="True" Style="{x:Null}">
<Expander IsExpanded="True">
<Expander.Background>
<SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
<SolidColorBrush Color="#FFBABABA"/>
</Expander.Background>
<Expander.Header>
<StackPanel Orientation="Horizontal">
@@ -57,9 +56,9 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<Expander IsExpanded="True" Style="{x:Null}">
<Expander IsExpanded="True">
<Expander.Background>
<SolidColorBrush Color="LightGray"></SolidColorBrush>
<SolidColorBrush Color="LightGray"/>
</Expander.Background>
<Expander.Header>
<StackPanel Orientation="Horizontal">
@@ -75,6 +74,6 @@
</GroupStyle.ContainerStyle>
</GroupStyle>
</DataGrid.GroupStyle>
</EgtBEAMWALL:QParamListV>
</EgtBEAMWALL:OnlyProd_QParamListV>
</Grid>
EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+7
View File
@@ -119,6 +119,9 @@
<Compile Include="CALCPanel\CalcIntegration.vb" />
<Compile Include="DataAccess\PartAddedEventArgs.vb" />
<Compile Include="DataAccess\BTLParamAddedEventArgs.vb" />
<Compile Include="ItemParamList\OnlyProd_QParamListV.xaml.vb">
<DependentUpon>OnlyProd_QParamListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\QParamListV.xaml.vb">
<DependentUpon>QParamListV.xaml</DependentUpon>
</Compile>
@@ -257,6 +260,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\OnlyProd_QParamListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\QParamListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml
+80
View File
@@ -0,0 +1,80 @@
<DataGrid x:Class="OnlyProd_QParamListV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
AutoGenerateColumns="False"
CanUserSortColumns="False"
CanUserResizeColumns="False"
CanUserResizeRows="False"
CanUserReorderColumns="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
Margin="0,0,0,5"
Style="{StaticResource DataGrid_OnlyProd}"
RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
<DataGrid.Columns>
<!--BWType-->
<DataGridTextColumn Binding="{Binding sBWType}"
Width="40"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Nome-->
<DataGridTextColumn Binding="{Binding sName}"
Width="50"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Descrizione-->
<DataGridTextColumn Binding="{Binding sDescription}"
Width="1*"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Default-->
<DataGridTextColumn Binding="{Binding sDefault}"
Width="65">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Minimo-->
<DataGridTextColumn Binding="{Binding sMin}"
Width="65"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Massimo-->
<DataGridTextColumn Binding="{Binding sMax}"
Width="65"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProd_QParamListV
End Class
EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml
+5 -2
View File
@@ -13,9 +13,12 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center" Margin="0,0,5,0"/>
<TextBlock Text="Macchina corrente"
VerticalAlignment="Center"
Margin="0,0,5,0"
Foreground="{StaticResource BeamWall_Corduroy}"/>
<!--Combobox per selezionare la macchina corrente-->
<ComboBox Grid.Row="0" Grid.Column="1"
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
+1 -1
View File
@@ -77,7 +77,7 @@
<StackPanel Grid.Column="2"
Orientation="Horizontal">
<TextBlock Text="{Binding Rows_Msg}"
Style="{StaticResource Option_TextBlock}"/>
Style="{StaticResource OptionTextBlock}"/>
<ComboBox ItemsSource="{Binding RowQuantityList}"
SelectedIndex="{Binding SelRowQuantity}"
Style="{StaticResource OnyProd_FeatureComboBox}"/>
EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
+1 -1
View File
@@ -75,7 +75,7 @@
<StackPanel Grid.Column="2"
Orientation="Horizontal">
<TextBlock Text="Rows"
Style="{StaticResource Option_TextBlock}"/>
Style="{StaticResource OptionTextBlock}"/>
<ComboBox ItemsSource="{Binding RowQuantityList}"
SelectedIndex="{Binding SelRowQuantity}"
Style="{StaticResource FeatureComboBox}"/>
EgtBEAMWALL.Supervisor/AxesPanel/OnlyProdAxesPanelV.xaml
+23
View File
@@ -0,0 +1,23 @@
<UserControl x:Class="OnlyProdAxesPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<ItemsControl ItemsSource="{Binding AxesList}"
Foreground="{StaticResource BeamWall_Corduroy}"
TextBlock.TextAlignment="Center">
<ItemsControl.ItemTemplate>
<DataTemplate>
<UniformGrid Columns="3">
<TextBlock Text="{Binding nId}"/>
<TextBlock Text="{Binding sName}"/>
<TextBlock Text="{Binding sValue}"/>
</UniformGrid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</UserControl>
EgtBEAMWALL.Supervisor/AxesPanel/OnlyProdAxesPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdAxesPanelV
End Class
EgtBEAMWALL.Supervisor/CALCPanel/OnlyProdCalcPanelV.xaml
+20
View File
@@ -0,0 +1,20 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdCalcPanelV"
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_OnlyProd}">
<Button ToolTip="{Binding Simulate_ToolTip}"
Command="{Binding Simulate_Command}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
</Button>
<ToggleButton Content="Log"
ToolTip="{Binding MachineLog_ToolTip}"
IsChecked="{Binding bMachineLog}"
Style="{StaticResource OnlyProdToolBar_ToggleButton}"
Foreground="{StaticResource BeamWall_White}"/>
</EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.Supervisor/CALCPanel/OnlyProdCalcPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdCalcPanelV
End Class
EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
+16 -19
View File
@@ -20,11 +20,10 @@ Public Class ConfigurationPageVM
Set(value As Integer)
m_SelConfigSubPage = value
If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
m_bGeneral_Visibility = Visibility.Visible
SetGeneral_Visibility(Visibility.Visible)
ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
m_bGeneral_Visibility = Visibility.Collapsed
SetGeneral_Visibility(Visibility.Collapsed)
End If
NotifyPropertyChanged(NameOf(General_Visibility))
End Set
End Property
@@ -109,26 +108,26 @@ Public Class ConfigurationPageVM
End Property
Private m_bGeneral_Visibility As Visibility = Visibility.Visible
Public Property General_Visibility As Visibility
Public ReadOnly Property General_Visibility As Visibility
Get
Return m_bGeneral_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetGeneral_Visibility(value As Visibility)
m_bGeneral_Visibility = value
NotifyPropertyChanged(NameOf(General_Visibility))
End Set
End Property
End Sub
Private m_bMachine_Visibility As Visibility = Visibility.Collapsed
Public Property Machine_Visibility As Visibility
Public ReadOnly Property Machine_Visibility As Visibility
Get
Return m_bMachine_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetMachine_Visibility(value As Visibility)
m_bMachine_Visibility = value
NotifyPropertyChanged(NameOf(Machine_Visibility))
End Set
End Property
End Sub
Private m_SectionTime As Double
Public Property SectionTime As String
@@ -185,15 +184,15 @@ Public Class ConfigurationPageVM
End Property
Private m_MachineParameter_Visibility As Visibility = Visibility.Collapsed
Public Property MachineParameter_Visibility As Visibility
Public ReadOnly Property MachineParameter_Visibility As Visibility
Get
Return m_MachineParameter_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetMachineParameter_Visibility(value As Visibility)
m_MachineParameter_Visibility = value
NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
End Set
End Property
End Sub
' Definizione comandi
Private m_cmdSave As ICommand
@@ -402,10 +401,8 @@ Public Class ConfigurationPageVM
Dim nDefaultReminderFrequency As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, 1)
SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
' rendo invisibile la sezione Offset presente nel tab Macchine
m_MachineParameter_Visibility = Visibility.Collapsed
m_bMachine_Visibility = Visibility.Collapsed
NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
NotifyPropertyChanged(NameOf(Machine_Visibility))
SetMachineParameter_Visibility(Visibility.Collapsed)
SetMachine_Visibility(Visibility.Collapsed)
End Sub
#End Region ' Constructor
EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+64
View File
@@ -211,6 +211,7 @@
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework.Aero2" />
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
</Reference>
@@ -318,16 +319,31 @@
<DependentUpon>AxesPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="AxesPanel\AxesPanelVM.vb" />
<Compile Include="AxesPanel\OnlyProdAxesPanelV.xaml.vb">
<DependentUpon>OnlyProdAxesPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="BTLViewModel\BTLFeatureVM.vb" />
<Compile Include="CALCPanel\CalcPanelV.xaml.vb">
<DependentUpon>CalcPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="CALCPanel\CALCPanelVM.vb" />
<Compile Include="CALCPanel\OnlyProdCalcPanelV.xaml.vb">
<DependentUpon>OnlyProdCalcPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="Comms\NUMAxiumComm.vb" />
<Compile Include="Comms\NUMAxiumPcToolkitComm.vb" />
<Compile Include="Comms\NUMFlexiumComm.vb" />
<Compile Include="Comms\TPAComm.vb" />
<Compile Include="Constants\ConstMachMsg.vb" />
<Compile Include="ItemParamList\OnlyProdPartInRawPartListV.xaml.vb">
<DependentUpon>OnlyProdPartInRawPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\OnlyProdRawPartListV.xaml.vb">
<DependentUpon>OnlyProdRawPartListV.xaml</DependentUpon>
</Compile>
<Compile Include="LeftPanel\OnlyProdLeftPanelV.xaml.vb">
<DependentUpon>OnlyProdLeftPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="MachineLogPage\MachineLogPageV.xaml.vb">
<DependentUpon>MachineLogPageV.xaml</DependentUpon>
</Compile>
@@ -386,6 +402,9 @@
<Compile Include="MainWindow\MainWindowM.vb" />
<Compile Include="OpenProjectFileDialog\OpenProjectFileDialogVM.vb" />
<Compile Include="ProjectFileVM\ProdFileVM.vb" />
<Compile Include="Project\OnlyProdProjectV.xaml.vb">
<DependentUpon>OnlyProdProjectV.xaml</DependentUpon>
</Compile>
<Compile Include="Project\ProjectV.xaml.vb">
<DependentUpon>ProjectV.xaml</DependentUpon>
</Compile>
@@ -394,6 +413,9 @@
<Compile Include="SceneHost\SceneHostV.xaml.vb">
<DependentUpon>SceneHostV.xaml</DependentUpon>
</Compile>
<Compile Include="ShowPanel\OnlyProdShowPanelV.xaml.vb">
<DependentUpon>OnlyProdShowPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ShowPanel\ShowPanelV.xaml.vb">
<DependentUpon>ShowPanelV.xaml</DependentUpon>
</Compile>
@@ -401,6 +423,9 @@
<Compile Include="StatusBar\StatusBarV.xaml.vb">
<DependentUpon>StatusBarV.xaml</DependentUpon>
</Compile>
<Compile Include="SupervisorManager\OnlyProdSupervisorManagerV.xaml.vb">
<DependentUpon>OnlyProdSupervisorManagerV.xaml</DependentUpon>
</Compile>
<Compile Include="SupervisorManager\SupervisorManagerV.xaml.vb">
<DependentUpon>SupervisorManagerV.xaml</DependentUpon>
</Compile>
@@ -422,6 +447,9 @@
<Compile Include="VariablesList\VariablesListVM.vb" />
<Compile Include="ViewerOptimizerCommThread\ViewerOptimizerComm.vb" />
<Compile Include="ViewerOptimizerCommThread\ViewerOptimizerCommThread.vb" />
<Compile Include="ViewPanel\OnlyProdViewPanelV.xaml.vb">
<DependentUpon>OnlyProdViewPanelV.xaml</DependentUpon>
</Compile>
<Compile Include="ViewPanel\ViewPanelV.xaml.vb">
<DependentUpon>ViewPanelV.xaml</DependentUpon>
</Compile>
@@ -438,10 +466,30 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="AxesPanel\OnlyProdAxesPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="CALCPanel\CalcPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CALCPanel\OnlyProdCalcPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ItemParamList\OnlyProdPartInRawPartListV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ItemParamList\OnlyProdRawPartListV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="LeftPanel\OnlyProdLeftPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MachineLogPage\MachineLogPageV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -498,6 +546,10 @@
<DependentUpon>MainWindowV.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Project\OnlyProdProjectV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Project\ProjectV.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -506,6 +558,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ShowPanel\OnlyProdShowPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ShowPanel\ShowPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -514,6 +570,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SupervisorManager\OnlyProdSupervisorManagerV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SupervisorManager\SupervisorManagerV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -526,6 +586,10 @@
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="ViewPanel\OnlyProdViewPanelV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ViewPanel\ViewPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml
+190
View File
@@ -0,0 +1,190 @@
<UserControl x:Class="OnlyProdPartInRawPartListV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.PartVMList,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelPart,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
BindingColumns="{Binding PartInRawPartColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Jaffa}"
ColumnHeaderForeground="{StaticResource BeamWall_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
ColumnHeaderFontSize="15"
ColumnHeaderPadding="0,2,0,2"
CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight_PartList}">
<Setter Property="Background" Value="{Binding Production_Background}"/>
</Style>
</DataGrid.RowStyle>
<DataGrid.Resources>
<!--REDO - Abilitazione-->
<DataGridCheckBoxColumn x:Key="colREDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"/>
<!--PDN - Nome-->
<DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.PDN_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--Validità pezzo-->
<DataGridTemplateColumn x:Key="colCALC">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="10"/>
</Grid.ColumnDefinitions>
<TextBlock Text="↓"
Foreground="Aqua"
TextAlignment="Center"
FontWeight="Bold"
FontSize="12"
Margin="0,-6,0,-2"
Visibility="{Binding CALC_FALL_Visibility}"/>
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
Grid.Column="1"
Background="{Binding Calc_Background}"/>
<Grid Grid.Column="2"
HorizontalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Ellipse Width="5"
Height="5"
Fill="Red"
Visibility="{Binding CALC_ROT_Visibility}"
HorizontalAlignment="Center"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
Foreground="{Binding CALC_ERR_Foreground}"
TextAlignment="Center"
FontWeight="Bold"
FontSize="12"
Margin="0,-6,0,-2"/>
</Grid>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Stato di produzione-->
<DataGridTemplateColumn x:Key="colPRODUCTION">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Border Background="{Binding Production_Background}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--NAM - Descrizione-->
<DataGridTextColumn x:Key="colNAM" Binding="{Binding sNAM}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.NAM_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--W - Larghezza-->
<DataGridTextColumn x:Key="colW" Binding="{Binding sW}" SortMemberPath="dW">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.W_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--H - Altezza-->
<DataGridTextColumn x:Key="colH" Binding="{Binding sH}" SortMemberPath="dH">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.H_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--L - Lunghezza-->
<DataGridTextColumn x:Key="colL" Binding="{Binding sL}" SortMemberPath="dL">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.L_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--ROT - Rotazione-->
<DataGridTextColumn x:Key="colROT" Binding="{Binding sROT}" SortMemberPath="dROT">
<DataGridTextColumn.Header>
<TextBlock Text="Rotazione"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--INV - Inversione-->
<DataGridTemplateColumn x:Key="colFLIP">
<DataGridTemplateColumn.Header>
<TextBlock Text="Inversione"/>
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--PosX - Posizione-->
<DataGridTextColumn x:Key="colPOSX" Binding="{Binding sPOSX, UpdateSourceTrigger=PropertyChanged}" SortMemberPath="dPOSX">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.PosX_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--PosY - Posizione-->
<DataGridTextColumn x:Key="colPOSY" Binding="{Binding sPOSY, UpdateSourceTrigger=PropertyChanged}" SortMemberPath="dPOSY">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.PosY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Off - Offset-->
<DataGridTextColumn x:Key="colOFFSET" Binding="{Binding sOffset}" SortMemberPath="dOffset">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Offset_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--MAT - Materiale-->
<DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.MAT_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--GRP - Gruppo-->
<DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--STOREY - Sottogruppo-->
<DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
</UserControl>
EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdPartInRawPartListV
End Class
EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml
+134
View File
@@ -0,0 +1,134 @@
<UserControl x:Class="OnlyProdRawPartListV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid x:Name="MachGroupDataGrid"
ItemsSource="{Binding Tag.MachGroupVMList_View,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
SelectedItem="{Binding Tag.SelectedMachGroup,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
BindingColumns="{Binding RawPartColumns}"
Sorting="MachGroupVMList_Sorting"
IsSynchronizedWithCurrentItem="True"
AutoGenerateColumns="False"
CanUserDeleteRows="False"
CanUserResizeRows="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
Margin="0,0,0,5"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderBackground="{StaticResource BeamWall_Christine}"
ColumnHeaderForeground="{StaticResource BeamWall_White}"
ColumnHeaderHorizontalContentAlignment="Center"
ColumnHeaderFontWeight="Bold"
ColumnHeaderFontSize="15"
ColumnHeaderPadding="0,2,0,2"
CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight_PartList}">
<Setter Property="Background" Value="{Binding Production_Background}"/>
<EventSetter Event="PreviewMouseDown" Handler="RawPartRow_PreviewMouseDown"/>
</Style>
</DataGrid.RowStyle>
<DataGrid.Resources>
<!--ID - Id gruppo-->
<DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}" SortMemberPath="nName">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.ID_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTemplateColumn x:Key="colPRODUCE">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button ToolTip="P"
Command="{Binding ProduceMachGroup_Command}"
IsEnabled="{Binding Produce_IsEnabled}"
Style="{StaticResource LeftPanel_SmallButton}">
<Image Source="/Resources/RawPartList/Produce.png" Stretch="Uniform"/>
</Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Validità pezzo-->
<DataGridTemplateColumn x:Key="colCALC">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Border Background="{Binding Calc_Background}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Stato di produzione-->
<DataGridTemplateColumn x:Key="colPRODUCTION">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Border Background="{Binding Production_Background}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--STARTCUT - Ritaglio iniziale-->
<DataGridTextColumn x:Key="colSTARTCUT" Binding="{Binding sStartCut}" SortMemberPath="dStartCut">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.StartOffset_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--W - Larghezza-->
<DataGridTextColumn x:Key="colW" Binding="{Binding dW}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.W_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--H - Altezza-->
<DataGridTextColumn x:Key="colH" Binding="{Binding dH}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.H_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--L - Lunghezza-->
<DataGridTextColumn x:Key="colL" Binding="{Binding dL}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.L_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--PosZ - Posizione in Z-->
<DataGridTextColumn x:Key="colPOSZ" Binding="{Binding sPosZ}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--MAT - Materiale-->
<DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Material_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--% - % utilizzo-->
<DataGridTextColumn x:Key="colUSAGE" Binding="{Binding sUsage}" SortMemberPath="dUsage">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Used_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<!--S - Scarti-->
<DataGridTextColumn x:Key="colWASTE" Binding="{Binding sWaste}" SortMemberPath="dWaste">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Waste_Msg,
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
</UserControl>
EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml.vb
+45
View File
@@ -0,0 +1,45 @@
Imports EgtBEAMWALL.Core
Imports System.ComponentModel
Public Class OnlyProdRawPartListV
Sub New()
' This call is required by the designer.
InitializeComponent()
' Add any initialization after the InitializeComponent() call.
MyComparer.SetDataGrid(MachGroupDataGrid)
AddHandler MachGroupDataGrid.ResetSort, AddressOf MachGroupDataGrid_ResetSort
End Sub
' funzione che permette di selezionare un RawPart anche quando gia' selezionato
Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
If TypeOf sender Is DataGridRow Then
Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
Dim RowVM As MyMachGroupVM = DirectCast(Row.DataContext, MyMachGroupVM)
' se gia' selezionato rifaccio selezione perche' potrbbe essere selezionato un BTLPart
If Not IsNothing(Row) AndAlso Row.IsSelected Then
Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup = Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup
End If
End If
End Sub
Private Sub MachGroupVMList_Sorting(sender As Object, e As DataGridSortingEventArgs)
' aggiorno direziona colonna
Dim column As DataGridColumn = e.Column
column.SortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
' ricalcolo colonne sort
Dim datagrid As DataGrid = sender
MyComparer.RefreshColumns()
' lancio sort custom
Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
e.Handled = True
End Sub
Private Sub MachGroupDataGrid_ResetSort()
MyComparer.RefreshColumns()
Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
End Sub
End Class
EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml
+167
View File
@@ -0,0 +1,167 @@
<Grid x:Class="OnlyProdLeftPanelV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
Width="Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="{Binding GridDims[0].GridLen, Mode=TwoWay}"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="{Binding GridDims[1].GridLen, Mode=TwoWay}"/>
</Grid.RowDefinitions>
<GroupBox Header="{Binding Channel_Msg}"
Visibility="{Binding Channel_Visibility}">
<ComboBox ItemsSource="{Binding ChannelList}"
SelectedItem="{Binding SelChannel}"
DisplayMemberPath="Name"/>
</GroupBox>
<GroupBox Grid.Row="1" Header="{Binding OPMode_Msg}"
Visibility="{Binding OPMode_Visibility}">
<ComboBox ItemsSource="{Binding OPModeList}"
SelectedItem="{Binding SelOPMode}"
DisplayMemberPath="Name"/>
</GroupBox>
<UniformGrid Grid.Row="2"
Columns="2"
TextBlock.TextAlignment="Center"
Margin="0,0,0,5">
<TextBlock Text="OPState"/>
<TextBlock Text="{Binding SelOPState.Name}"/>
</UniformGrid>
<UniformGrid Grid.Row="3"
Columns="6"
Visibility="{Binding E80000_Visibility}">
<TextBlock Text="E80000: "/>
<TextBlock Text="{Binding sE80000}"
HorizontalAlignment="Left"/>
<TextBlock Text="E80001: "/>
<TextBlock Text="{Binding sE80001}"
HorizontalAlignment="Left"/>
<TextBlock Text="E80002: "
Visibility="{Binding E80002_Visibility}"/>
<TextBlock Text="{Binding sE80002}"
HorizontalAlignment="Left"
Visibility="{Binding E80002_Visibility}"/>
</UniformGrid>
<Expander Grid.Row="4"
Margin="0,0,0,2">
<Expander.Header>
<TextBlock Text="Axis" FontSize="15"/>
</Expander.Header>
<EgtBEAMWALL:OnlyProdAxesPanelV DataContext="{StaticResource AxesPanelVM}"/>
</Expander>
<Grid Grid.Row="5">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.RowSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
<StackPanel Grid.Row="0"
Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="0,3,5,2">
<Button Command="{Binding MoveUpRawPart_Command}"
IsEnabled="{Binding MoveRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/MoveUp.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding MoveDownRawPart_Command}"
IsEnabled="{Binding MoveRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/MoveDown.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ProduceAll_ToolTip}"
Command="{Binding ProduceAll_Command}"
IsEnabled="{Binding LeftPanel_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/ProduceAll.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding DoneRawPart_ToolTip}"
Command="{Binding DoneRawPart_Command}"
IsEnabled="{Binding DoneRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/DoneRawPart.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding ResetRawPart_ToolTip}"
Command="{Binding ResetRawPart_Command}"
IsEnabled="{Binding ResetRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/ResetRawPart.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding DeleteRawPart_ToolTip}"
Command="{Binding DeleteRawPart_Command}"
IsEnabled="{Binding DeleteRawPart_IsEnabled}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/DeleteRawPart.png" Stretch="Uniform"/>
</Button>
</StackPanel>
<EgtBEAMWALL:OnlyProdRawPartListV Grid.Row="1"
DataContext="{StaticResource RawPartListVM}"
Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
Margin="2.5,0,2.5,0"/>
</Grid>
<GridSplitter Grid.Row="6"
Height="3"
HorizontalAlignment="Stretch"
ResizeDirection="Rows"
ResizeBehavior="PreviousAndNext"
Background="Transparent"/>
<Grid Grid.Row="7">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.RowSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
<StackPanel Grid.Row="0"
Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="0,3,5,2">
<Button ToolTip="{Binding PrintLabel_ToolTip}"
Command="{Binding PrintLabel_Command}"
IsEnabled="{Binding LeftPanel_IsEnabled}"
Visibility="{Binding PrintLabel_Visibility}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/PrintLabel.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding DonePart_ToolTip}"
Command="{Binding DonePart_Command}"
IsEnabled="{Binding LeftPanel_IsEnabled}"
Visibility="{Binding DonePart_Visibility}"
Style="{StaticResource LeftPanel_Button}">
<Image Source="/Resources/LeftPanel/DonePart.png" Stretch="Uniform"/>
</Button>
</StackPanel>
<Grid Grid.Row="1" x:Name="PartFeatureGrid">
<Grid.Resources>
<EgtBEAMWALL:FeatureDataGridHeightConverter x:Key="FeatureDataGridHeightConverter"/>
</Grid.Resources>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<EgtBEAMWALL:OnlyProdPartInRawPartListV DataContext="{StaticResource PartInRawPartListVM}"
Tag="{Binding Tag.SelectedMachGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
Margin="2.5,0,2.5,0"/>
<EgtBEAMWALL:FeatureInPartInRawPartListV Grid.Row="1"
Height="{Binding ActualHeight, ElementName=PartFeatureGrid, Converter={StaticResource FeatureDataGridHeightConverter}}"
DataContext="{StaticResource FeatureInPartInRawPartListVM}"
Tag="{Binding Tag.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"/>
</Grid>
</Grid>
</Grid>
EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdLeftPanelV
End Class
EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb
+2 -2
View File
@@ -361,8 +361,8 @@ Public Class MachinePanelVM
End Property
Public Sub ParameterMachineVisibility()
Map.refConfigurationPageVM.MachineParameter_Visibility = Visibility.Visible
Map.refConfigurationPageVM.Machine_Visibility = Visibility.Visible
Map.refConfigurationPageVM.SetMachineParameter_Visibility(Visibility.Visible)
Map.refConfigurationPageVM.SetMachine_Visibility(Visibility.Visible)
End Sub
#End Region ' ParameterMachine
EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
+2 -1
View File
@@ -30,7 +30,8 @@
</Style>
</TabControl.ItemContainerStyle>
<TabItem>
<EgtBEAMWALL:ProjectV DataContext="{StaticResource ProjectVM}"/>
<!--<EgtBEAMWALL:ProjectV DataContext="{StaticResource ProjectVM}"/>-->
<ContentControl Content="{Binding ProjectContent}"/>
</TabItem>
<TabItem>
<EgtBEAMWALL:InputsPageV DataContext="{StaticResource InputsPageVM}"/>
EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+6
View File
@@ -41,6 +41,12 @@ Public Class MainWindowVM
End Set
End Property
Public ReadOnly Property ProjectContent As Object
Get
Return If(Map.refMainWindowVM.MainWindowM.bOnlyProd, New OnlyProdProjectV(), New ProjectV())
End Get
End Property
' Definizione comandi
Private m_cmdAboutBox As ICommand
Private m_cmdCloseApplication As ICommand
EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml
+81
View File
@@ -0,0 +1,81 @@
<EgtFloating:EgtFloatingManager x:Class="OnlyProdProjectV"
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"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
DataContext="{StaticResource ProjectVM}">
<EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top">
<EgtBEAMWALL:OnlyProdSupervisorManagerV DataContext="{StaticResource SupervisorManagerVM}"/>
<EgtBEAMWALLCORE:MachinePanelV DataContext="{StaticResource MachinePanelVM}" Visibility="Collapsed"/>
</EgtFloating:EgtFloatingTray>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding GridDims[0].GridLen, Mode=TwoWay}"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding GridDims[1].GridLen, Mode=TwoWay}"/>
</Grid.ColumnDefinitions>
<EgtBEAMWALL:OnlyProdLeftPanelV Grid.Column="2" Grid.Row="0" Grid.RowSpan="4"
DataContext="{StaticResource LeftPanelVM}"
Tag="{Binding DataContext.SupervisorMachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<EgtFloating:EgtFloatingTray x:Name="SCENETOPTRAY">
<WrapPanel Orientation="Horizontal" Width="{Binding ActualWidth, ElementName=TOPTRAY}" HorizontalAlignment="Center">
<EgtBEAMWALL:OnlyProdShowPanelV DataContext="{StaticResource ShowPanelVM}" Margin="0,0,10,0"/>
<EgtBEAMWALL:OnlyProdViewPanelV DataContext="{StaticResource ViewPanelVM}" Margin="0,0,10,0"/>
<EgtBEAMWALL:OnlyProdCalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
</WrapPanel>
</EgtFloating:EgtFloatingTray>
<EgtBEAMWALL:MachCommandMessagePanelV Grid.Row="2"
DataContext="{StaticResource MachCommandMessagePanelVM}"/>
<TabControl Grid.Row="1"
SelectedIndex="{Binding SelTabPage}"
TabStripPlacement="Right"
Margin="0"
Padding="0"
BorderThickness="0">
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
<Setter Property="Visibility" Value="Collapsed"/>
</Style>
</TabControl.ItemContainerStyle>
<TabItem Header="SCENE">
<TabItem.Content>
<EgtBEAMWALL:SceneHostV Grid.Column="0" Grid.Row="1"/>
</TabItem.Content>
</TabItem>
<TabItem Header="MDI">
<TabItem.Content>
<EgtBEAMWALL:MDIPageV DataContext="{StaticResource MDIPageVM}"/>
</TabItem.Content>
</TabItem>
<TabItem Header="MACHINELOG">
<TabItem.Content>
<EgtBEAMWALL:MachineLogPageV DataContext="{StaticResource MachineLogPageVM}"/>
</TabItem.Content>
</TabItem>
</TabControl>
</Grid>
<GridSplitter Grid.Column="1"
Grid.RowSpan="4"
Width="3"
HorizontalAlignment="Center"
VerticalAlignment="Stretch"
Background="Transparent"/>
</Grid>
</EgtFloating:EgtFloatingManager>
EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdProjectV
End Class
EgtBEAMWALL.Supervisor/Project/ProjectV.xaml
+3 -3
View File
@@ -3,12 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor">
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
DataContext="{StaticResource ProjectVM}">
<EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top">
<EgtBEAMWALL:SupervisorManagerV DataContext="{StaticResource SupervisorManagerVM}"/>
<EgtBEAMWALLCORE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"
Visibility="Collapsed"/>
<EgtBEAMWALLCORE:MachinePanelV DataContext="{StaticResource MachinePanelVM}" Visibility="Collapsed"/>
</EgtFloating:EgtFloatingTray>
<Grid>
EgtBEAMWALL.Supervisor/ShowPanel/OnlyProdShowPanelV.xaml
+24
View File
@@ -0,0 +1,24 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdShowPanelV"
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_OnlyProd}">
<RadioButton ToolTip="{Binding RenderingWFToolTip}"
IsChecked="{Binding WireframeIsChecked}"
Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingWF.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingHLToolTip}"
IsChecked="{Binding HiddenLineIsChecked}"
Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingHL.png" Stretch="Uniform"/>
</RadioButton>
<RadioButton ToolTip="{Binding RenderingSHToolTip}"
IsChecked="{Binding ShadingIsChecked}"
Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
<Image Source="/Resources/ShowPanel/RenderingSH.png" Stretch="Uniform"/>
</RadioButton>
</EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.Supervisor/ShowPanel/OnlyProdShowPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdShowPanelV
End Class
EgtBEAMWALL.Supervisor/SupervisorManager/OnlyProdSupervisorManagerV.xaml
+35
View File
@@ -0,0 +1,35 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdSupervisorManagerV"
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"
IsEnabled="{Binding SupervisorManager_IsEnabled}"
Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<!--Barra superiore dei comandi-->
<Button Command="{Binding OpenCommand}"
ToolTip="{Binding OpenToolTip}"
ContextMenuService.Placement="Bottom"
Tag="{Binding}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Button.ContextMenu>
<ContextMenu ItemsSource="{Binding MruFileNames}">
<ContextMenu.Resources>
<Style TargetType="{x:Type MenuItem}">
<Setter Property="Command"
Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
<Setter Property="CommandParameter" Value="{Binding}" />
</Style>
</ContextMenu.Resources>
</ContextMenu>
</Button.ContextMenu>
<Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
</Button>
<Button Command="{Binding GoToProd_Command}"
ToolTip="{Binding GoToProd_ToolTip}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.Supervisor/SupervisorManager/OnlyProdSupervisorManagerV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdSupervisorManagerV
End Class
EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml
-1
View File
@@ -32,5 +32,4 @@
<Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+1207 -26
View File
File diff suppressed because it is too large Load Diff
EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml
+44
View File
@@ -0,0 +1,44 @@
<EgtFloating:EgtFloatingPanel x:Class="OnlyProdViewPanelV"
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_OnlyProd}">
<Button ToolTip="{Binding ZoomAllToolTip}"
Command="{Binding ZoomAllCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromTopToolTip}"
Command="{Binding TopViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromFrontToolTip}"
Command="{Binding FrontViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromRightToolTip}"
Command="{Binding RightViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromBackToolTip}"
Command="{Binding BackViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromLeftToolTip}"
Command="{Binding LeftViewCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
</Button>
<Button ToolTip="{Binding LookFromIso_SWToolTip}"
Command="{Binding IsoViewSWCommand}"
Style="{StaticResource ToolBarViewPanel_Button}">
<Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
</Button>
</EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdViewPanelV
End Class
EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
+2 -2
View File
@@ -87,7 +87,7 @@ Public Class BTLStructureVM
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refProdProjManagerVM.SelProdProj = ProdProj.PROJ
' rendo visibile PartManager
Map.refLeftPanelVM.OnlyProdPartManagerVisibility = Visibility.Visible
Map.refLeftPanelVM.SetOnlyProdPartManager_Visibility(Visibility.Visible)
End If
' rendo enable bottone parameters
Map.refLeftPanelVM.SetParametersIsEnabled(True)
@@ -104,7 +104,7 @@ Public Class BTLStructureVM
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
' rendo visibile PartManager
Map.refLeftPanelVM.OnlyProdPartManagerVisibility = Visibility.Collapsed
Map.refLeftPanelVM.SetOnlyProdPartManager_Visibility(Visibility.Collapsed)
End If
' rendo disable bottone parameters
Map.refLeftPanelVM.SetParametersIsEnabled(False)
EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
+36 -40
View File
@@ -6,6 +6,7 @@ Imports EgtBEAMWALL.Core
Imports System.Linq.Expressions
Imports MS.Internal
Imports Ionic.Zip
Imports Google.Protobuf.WellKnownTypes
Public Class ConfigurationPageVM
Inherits VMBase
@@ -35,25 +36,22 @@ Public Class ConfigurationPageVM
Set(value As Integer)
m_SelConfigSubPage = value
If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
m_bGeneral_Visibility = Visibility.Visible
m_bParameterQ_Visibility = Visibility.Collapsed
m_bPDFEditor_Visibility = Visibility.Collapsed
SetGeneral_Visibility(Visibility.Visible)
SetParamaterQ_Visibility(Visibility.Collapsed)
SetPDFEditor_Visibility(Visibility.Collapsed)
ElseIf m_SelConfigSubPage = ConfigSubPages.QPARAMETERS Then
m_bParameterQ_Visibility = Visibility.Visible
m_bGeneral_Visibility = Visibility.Collapsed
m_bPDFEditor_Visibility = Visibility.Collapsed
SetParamaterQ_Visibility(Visibility.Visible)
SetGeneral_Visibility(Visibility.Collapsed)
SetPDFEditor_Visibility(Visibility.Collapsed)
ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
m_bGeneral_Visibility = Visibility.Collapsed
m_bParameterQ_Visibility = Visibility.Collapsed
m_bPDFEditor_Visibility = Visibility.Collapsed
SetGeneral_Visibility(Visibility.Collapsed)
SetParamaterQ_Visibility(Visibility.Collapsed)
SetPDFEditor_Visibility(Visibility.Collapsed)
ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then
m_bPDFEditor_Visibility = Visibility.Visible
m_bGeneral_Visibility = Visibility.Collapsed
m_bParameterQ_Visibility = Visibility.Collapsed
SetPDFEditor_Visibility(Visibility.Visible)
SetGeneral_Visibility(Visibility.Collapsed)
SetParamaterQ_Visibility(Visibility.Collapsed)
End If
NotifyPropertyChanged(NameOf(General_Visibility))
NotifyPropertyChanged(NameOf(ParameterQ_Visibility))
NotifyPropertyChanged(NameOf(PDFEditor_Visibility))
End Set
End Property
@@ -236,59 +234,59 @@ Public Class ConfigurationPageVM
End Property
Private m_bGeneral_Visibility As Visibility = Visibility.Visible
Public Property General_Visibility As Visibility
Public ReadOnly Property General_Visibility As Visibility
Get
Return m_bGeneral_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetGeneral_Visibility(value As Visibility)
m_bGeneral_Visibility = value
NotifyPropertyChanged(NameOf(General_Visibility))
End Set
End Property
End Sub
Private m_bParameterQ_Visibility As Visibility = Visibility.Collapsed
Public Property ParameterQ_Visibility As Visibility
Public ReadOnly Property ParameterQ_Visibility As Visibility
Get
Return m_bParameterQ_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetParamaterQ_Visibility(value As Visibility)
m_bParameterQ_Visibility = value
NotifyPropertyChanged(NameOf(ParameterQ_Visibility))
End Set
End Property
End Sub
Private m_bMachine_Visibility As Visibility = Visibility.Collapsed
Public Property Machine_Visibility As Visibility
Public ReadOnly Property Machine_Visibility As Visibility
Get
Return m_bMachine_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetMachine_Visibility(value As Visibility)
m_bMachine_Visibility = value
NotifyPropertyChanged(NameOf(Machine_Visibility))
End Set
End Property
End Sub
Private m_bPDFEditor_Visibility As Visibility = Visibility.Collapsed
Public Property PDFEditor_Visibility As Visibility
Public ReadOnly Property PDFEditor_Visibility As Visibility
Get
Return m_bPDFEditor_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetPDFEditor_Visibility(value As Visibility)
m_bPDFEditor_Visibility = value
NotifyPropertyChanged(NameOf(PDFEditor_Visibility))
End Set
End Property
End Sub
Private m_MachineParameter_Visibility As Visibility = Visibility.Collapsed
Public Property MachineParameter_Visibility As Visibility
Friend m_MachineParameter_Visibility As Visibility = Visibility.Collapsed
Public ReadOnly Property MachineParameter_Visibility As Visibility
Get
Return m_MachineParameter_Visibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetMachineParameter_Visibility(value As Visibility)
m_MachineParameter_Visibility = value
NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
End Set
End Property
End Sub
' Definizione comandi
Private m_cmdSave As ICommand
@@ -524,10 +522,8 @@ Public Class ConfigurationPageVM
SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
Dim nExternalBackupActive As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_EXTERNALBACKUPACTIVE, 0)
m_bExternalBackupActive = nExternalBackupActive > 0
m_MachineParameter_Visibility = Visibility.Collapsed
m_bMachine_Visibility = Visibility.Collapsed
NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
NotifyPropertyChanged(NameOf(Machine_Visibility))
SetMachineParameter_Visibility(Visibility.Collapsed)
SetMachine_Visibility(Visibility.Collapsed)
NotifyPropertyChanged(NameOf(bExternalBackupActive))
End Sub
EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml
+2 -1
View File
@@ -14,7 +14,8 @@
<RowDefinition Height="6*"/>
</Grid.RowDefinitions>
<TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"
SelectedIndex="{Binding SelConfigSubPage}">
SelectedIndex="{Binding SelConfigSubPage}"
Style="{StaticResource OnlyProd_TabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Orientation="Horizontal">
EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+7
View File
@@ -251,6 +251,9 @@
<Compile Include="MacroFeatureWnd\NewMacroFeatureWnd.xaml.vb">
<DependentUpon>NewMacroFeatureWnd.xaml</DependentUpon>
</Compile>
<Compile Include="MainMenu\OnlyProdMainMenuV.xaml.vb">
<DependentUpon>OnlyProdMainMenuV.xaml</DependentUpon>
</Compile>
<Compile Include="MovePartInRawPartWnd\OnlyProdMovePartInRawPartWndV.xaml.vb">
<DependentUpon>OnlyProdMovePartInRawPartWndV.xaml</DependentUpon>
</Compile>
@@ -651,6 +654,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainMenu\OnlyProdMainMenuV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MovePartInRawPartWnd\OnlyProdMovePartInRawPartWndV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
+2 -1
View File
@@ -33,7 +33,8 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center"/>
VerticalAlignment="Center"
HorizontalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml
+12 -4
View File
@@ -129,9 +129,13 @@
<Button Command="{Binding BackRotation_Command}"
Height="15"
Width="15"
VerticalAlignment="Center">
VerticalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Foreground="{StaticResource BeamWall_Kashmir}">
<TextBlock Text="&lt;"
Margin="-5"/>
FontWeight="Bold"
Margin="0,-5,0,-2"/>
</Button>
<TextBlock Text="{Binding sROT}"
Grid.Column="1"
@@ -140,9 +144,13 @@
Grid.Column="2"
Height="15"
Width="15"
VerticalAlignment="Center">
VerticalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Foreground="{StaticResource BeamWall_Kashmir}">
<TextBlock Text=">"
Margin="-5"/>
FontWeight="Bold"
Margin="0,-5,0,-2"/>
</Button>
</Grid>
</DataTemplate>
EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
+3 -2
View File
@@ -42,7 +42,8 @@
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
VerticalAlignment="Center"/>
VerticalAlignment="Center"
HorizontalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -67,7 +68,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
Style="{StaticResource OnlyProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
+5 -5
View File
@@ -55,15 +55,15 @@ Public Class LeftPanelVM
End Sub
Private m_OnlyProdPartManagerVisibility As Visibility = Visibility.Collapsed
Public Property OnlyProdPartManagerVisibility As Visibility
Public ReadOnly Property OnlyProdPartManagerVisibility As Visibility
Get
Return m_OnlyProdPartManagerVisibility
End Get
Set(value As Visibility)
End Property
Friend Sub SetOnlyProdPartManager_Visibility(value As Visibility)
m_OnlyProdPartManagerVisibility = value
NotifyPropertyChanged(NameOf(OnlyProdPartManagerVisibility))
End Set
End Property
End Sub
' Definizione comandi
Private m_cmdData As ICommand
@@ -73,7 +73,7 @@ Public Class LeftPanelVM
Public ReadOnly Property SearchFilter_Msg As String
Get
Return "Search & Filter"
Return EgtMsg(61949)
End Get
End Property
EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+7
View File
@@ -11,6 +11,13 @@
</Grid.RowDefinitions>
<UniformGrid Columns="5"
Margin="0,10,0,10">
<UniformGrid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
</LinearGradientBrush>
</UniformGrid.Background>
<Expander Header="{Binding Section_Msg}">
<ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb
+7 -2
View File
@@ -372,8 +372,13 @@ Public Class MachinePanelVM
End Property
Public Sub ParameterMachineVisibility()
Map.refConfigurationPageVM.MachineParameter_Visibility = Visibility.Visible
Map.refConfigurationPageVM.Machine_Visibility = Visibility.Visible
If Map.refConfigurationPageVM.m_MachineParameter_Visibility Then
Map.refConfigurationPageVM.SetMachineParameter_Visibility(Visibility.Visible)
Map.refConfigurationPageVM.SetMachine_Visibility(Visibility.Visible)
Else
Map.refConfigurationPageVM.SetMachineParameter_Visibility(Visibility.Collapsed)
Map.refConfigurationPageVM.SetMachine_Visibility(Visibility.Collapsed)
End If
End Sub
#End Region ' ParameterMachine
EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml
+30
View File
@@ -0,0 +1,30 @@
<StackPanel x:Class="OnlyProdMainMenuV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Orientation="Horizontal"
IsEnabled="{Binding MainMenu_IsEnabled}"
DataContext="{StaticResource MainMenuVM}">
<!--Barra superiore dei comandi-->
<UniformGrid Rows="1">
<RadioButton Content="{Binding OnlyProdPage_Msg}"
IsChecked="{Binding OnlyProdPage_IsChecked}"
Visibility="{Binding OnlyProdPage_Visibility}"
Style="{StaticResource MainMenu_ToggleButton}"/>
<Button Content="{Binding Supervisor_Msg}"
Command="{Binding Supervisor_Command}"
Visibility="{Binding Supervisor_Visibility}"
Style="{StaticResource MainMenu_Button}"/>
<RadioButton Content="{Binding Configuration_Msg}"
IsChecked="{Binding Config_IsChecked}"
Style="{StaticResource MainMenu_ToggleButton}"/>
<Button Command="{Binding SendFeedbackCommand}"
ToolTip="{Binding SendFeedbackToolTip}"
Style="{StaticResource MainMenu_Button}"
IsEnabled="{Binding SendFeedbackIsEnabled}"
HorizontalAlignment="Left"
Width="40">
<Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/>
</Button>
</UniformGrid>
</StackPanel>
EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml.vb
+3
View File
@@ -0,0 +1,3 @@
Public Class OnlyProdMainMenuV
End Class
EgtBEAMWALL.ViewerOptimizer/PdfViewer/PdfViewer.xaml.vb
-54
View File
@@ -7,22 +7,6 @@ Imports Windows.Storage.Streams
Partial Public Class PdfViewer
Inherits UserControl
'Public Property PdfPath As String
' Get
' Return CStr(GetValue(PdfPathProperty))
' End Get
' Set(value As String)
' SetValue(PdfPathProperty, value)
' End Set
'End Property
'Private Shared m_Items As New List(Of Image)
'Public Shared ReadOnly Property Items As List(Of Image)
' Get
' Return m_Items
' End Get
'End Property
Public Property PdfPath As String
Get
Return CStr(GetValue(PdfPathProperty))
@@ -32,11 +16,6 @@ Partial Public Class PdfViewer
End Set
End Property
'Public Shared ReadOnly PdfPathProperty As DependencyProperty = DependencyProperty.Register("PdfPath",
' GetType(String),
' GetType(PdfViewer),
' New FrameworkPropertyMetadata(String.Empty, New PropertyChangedCallback(AddressOf OnPdfPathChanged)))
Public Shared ReadOnly PdfPathProperty As DependencyProperty = DependencyProperty.Register("PdfPath",
GetType(String),
GetType(PdfViewer),
@@ -51,43 +30,10 @@ Partial Public Class PdfViewer
End If
End Sub
'Private Shared Sub OnPdfPathChanged(d As DependencyObject, e As DependencyPropertyChangedEventArgs)
' Dim pdfDrawer As PdfViewer = CType(d, PdfViewer)
' If Not String.IsNullOrEmpty(pdfDrawer.PdfPath) Then
' Dim path = System.IO.Path.GetFullPath(pdfDrawer.PdfPath)
' StorageFile.GetFileFromPathAsync(path).AsTask().ContinueWith(Function(t) PdfDocument.LoadFromFileAsync(t.Result).AsTask()).Unwrap().ContinueWith(Function(t2) PdfToImages(t2.Result), TaskScheduler.FromCurrentSynchronizationContext())
' End If
'End Sub
Sub New()
InitializeComponent()
End Sub
'''' <summary>
'''' Funzione che trasforma le pagine del pdf in immagine
'''' </summary>
'''' <param name="pdfDoc">Singola pagina del PDf</param>
'''' <returns></returns>
'Private Shared Async Function PdfToImages(pdfDoc As PdfDocument) As Task
' 'Dim items As ItemCollection = pdfViewer.PagesContainer.Items
' Items.Clear()
' If IsNothing(pdfDoc) Then Return
' For i As Integer = 0 To pdfDoc.PageCount - 1
' Using page As PdfPage = pdfDoc.GetPage(i)
' Dim bitmap As BitmapImage = Await PageToBitmapAsync(page)
' Dim image As New Image With {
' .Source = bitmap,
' .HorizontalAlignment = HorizontalAlignment.Center,
' .Width = bitmap.Width,
' .Height = bitmap.Height
' }
' Items.Add(image)
' End Using
' Next
'End Function
''' <summary>
''' Funzione che trasforma le pagine del pdf in immagine
''' </summary>
EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml
+7
View File
@@ -4,6 +4,13 @@
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
DataContext="{StaticResource ProdProjManagerVM}"
SelectedIndex="{Binding SelProdProj}">
<TabControl.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
<GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
<GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
<GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
</LinearGradientBrush>
</TabControl.Background>
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml
+1
View File
@@ -5,6 +5,7 @@
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
DataContext="{StaticResource ProjectVM}">
<EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top">
<EgtBEAMWALL:ProjManagerV DataContext="{StaticResource ProjManagerVM}"
Visibility="{Binding DataContext.ProjManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+254 -649
View File
File diff suppressed because it is too large Load Diff