- aggiunta pagina copia multipla
- gestito file csv output - migliorata grafica - aggiunto stato porta da non produrre - creazione file ddf al momento della verifica - modificata cancellazione con cancella csv o cancella singole porte create manualmente - aggiunta gestione tipo di apertura - aggiunta fase per gestionale
This commit is contained in:
Emmanuele Sassi
@@ -31,6 +31,12 @@ Module ConstIni
|
||||
Public Const K_HEIGHT As String = "Height"
|
||||
Public Const K_WIDTH As String = "Width"
|
||||
Public Const K_THICKNESS As String = "Thickness"
|
||||
Public Const K_SWING As String = "Swing"
|
||||
Public Const K_PHASE As String = "Phase"
|
||||
Public Const K_STATE As String = "State"
|
||||
Public Const K_PROGRAMSENT As String = "ProgramSent"
|
||||
Public Const K_PROGRAMSTART As String = "ProgramStart"
|
||||
Public Const K_PROGRAMEND As String = "ProgramEnd"
|
||||
Public Const K_MANUALADDEDDOORNAME As String = "ManualAddedDoorName"
|
||||
Public Const K_DELIMITER As String = "Delimiter"
|
||||
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:Effector.Plugin.DoorArreda">
|
||||
<Grid.Resources>
|
||||
<local:StateToSelColorConverter x:Key="StateToSelColorConverter"/>
|
||||
</Grid.Resources>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
@@ -11,41 +14,65 @@
|
||||
<Button Content="CSV"
|
||||
ToolTip="Apri file CSV"
|
||||
Command="{Binding OpenCSV_Command}"
|
||||
IsEnabled="{Binding bExecButton_IsEnabled}"/>
|
||||
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Salta Porta"
|
||||
ToolTip="Blocca Porta selezionata, chenon verrà mandata in produzione"
|
||||
Command="{Binding SkipDoor_Command}"/>
|
||||
ToolTip="Blocca Porta selezionata, che non verrà mandata in produzione"
|
||||
Command="{Binding SkipDoor_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Porta da non produrre"
|
||||
ToolTip="Segna la Porta selezionatacome da non produrre"
|
||||
Command="{Binding NotProduceDoor_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="↑"
|
||||
ToolTip="Sposta su"
|
||||
Command="{Binding MoveUp_Command}"/>
|
||||
Command="{Binding MoveUp_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="↓"
|
||||
ToolTip="Sposta giù"
|
||||
Command="{Binding MoveDown_Command}"/>
|
||||
<Button Content="Cancella"
|
||||
ToolTip="Cancella porta selezionata"
|
||||
Command="{Binding Delete_Command}"/>
|
||||
<Button Content="Cancella tutto"
|
||||
ToolTip="Cancella tutte le porte non in produzione"
|
||||
Command="{Binding DeleteAll_Command}"/>
|
||||
Command="{Binding MoveDown_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Cancella porta"
|
||||
ToolTip="Cancella porta selezionata (se non appartenente ad un csv)"
|
||||
Command="{Binding Delete_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Cancella csv"
|
||||
ToolTip="Cancella tutte le porte del csv della porta selezionata"
|
||||
Command="{Binding DeleteAll_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Produci"
|
||||
ToolTip="Mette in coda di produzione la porta selezionata"
|
||||
Command="{Binding Produce_Command}"/>
|
||||
Command="{Binding Produce_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Produci Tutte"
|
||||
ToolTip="Mette in coda di produzione tutte le porte"
|
||||
Command="{Binding ProduceAll_Command}"/>
|
||||
Command="{Binding ProduceAll_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Reset Coda di Produzione"
|
||||
ToolTip="Riporta tutte le porte pronte per essere lavorate allo stato Verificate state"
|
||||
Command="{Binding ResetProductionQueue_Command}"/>
|
||||
Command="{Binding ResetProductionQueue_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Verifica"
|
||||
ToolTip="Verifica tutte le porte in stato Non Verificata"
|
||||
Command="{Binding Verify_Command}"
|
||||
IsEnabled="{Binding bExecButton_IsEnabled}"/>
|
||||
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Aggiungi"
|
||||
ToolTip="Aggiunge una porta alla lista"
|
||||
Command="{Binding AddDoor_Command}"/>
|
||||
Command="{Binding AddDoor_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Copia"
|
||||
ToolTip="Copia la porta selezionata"
|
||||
Command="{Binding CopyDoor_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Copia Multipla"
|
||||
ToolTip="Copia Multipla della porta selezionata"
|
||||
Command="{Binding MultipleCopyDoor_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
<Button Content="Salva CSV"
|
||||
ToolTip="Salva un csv di produzione"
|
||||
Command="{Binding SaveCSV_Command}"/>
|
||||
Command="{Binding SaveCSV_Command}"
|
||||
Style="{StaticResource DoorList_Button}"/>
|
||||
</StackPanel>
|
||||
<DataGrid Grid.Row="1"
|
||||
ItemsSource="{Binding DoorList}"
|
||||
@@ -54,95 +81,209 @@
|
||||
CanUserDeleteRows="False"
|
||||
CanUserResizeRows="False"
|
||||
SelectionMode="Single"
|
||||
SelectionUnit="FullRow"
|
||||
CanUserSortColumns="False"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
BeginningEdit="DoorList_BeginningEdit"
|
||||
>
|
||||
HorizontalGridLinesBrush="Transparent"
|
||||
VerticalGridLinesBrush="Transparent"
|
||||
ColumnHeaderHeight="32"
|
||||
HeadersVisibility="Column"
|
||||
FontSize="12"
|
||||
FontFamily="/Resources/Fonts/#Roboto"
|
||||
FontWeight="Regular"
|
||||
RowHeight="32">
|
||||
<DataGrid.ColumnHeaderStyle>
|
||||
<Style TargetType="{x:Type DataGridColumnHeader}">
|
||||
<Setter Property="Background" Value="{StaticResource Effector_DarkBlue}"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center"/>
|
||||
<Setter Property="FontSize" Value="15"/>
|
||||
<Setter Property="Padding" Value="10,0,10,0"/>
|
||||
</Style>
|
||||
</DataGrid.ColumnHeaderStyle>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header=""
|
||||
<DataGridTextColumn Header="ID"
|
||||
Binding="{Binding nId}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTemplateColumn Header="DDF"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTemplateColumn Header="DDF/DDT File Name"
|
||||
Width="Auto">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock Text="{Binding sDDFName}"/>
|
||||
<TextBlock Text="{Binding sDDFName}"
|
||||
Style="{StaticResource DataGridTextColumn_TextBlock}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
<DataGridTemplateColumn.CellEditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox IsEditable="True"
|
||||
Text="{Binding sDDFName}"
|
||||
ItemsSource="{Binding DataContext.DDTList, RelativeSource={RelativeSource AncestorType={x:Type local:DoorListPageV}}}"/>
|
||||
ItemsSource="{Binding DataContext.DDTList, RelativeSource={RelativeSource AncestorType={x:Type local:DoorListPageV}}}"
|
||||
Style="{StaticResource DataGridTemplateColumn_ComboBox}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellEditingTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Header="DDF"
|
||||
Binding="{Binding sDDFName}"
|
||||
Width="Auto"/>-->
|
||||
<!--<DataGridTextColumn Header="Quantity"
|
||||
Binding="{Binding nQuantity}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>-->
|
||||
<DataGridTextColumn Header="Width"
|
||||
<DataGridTextColumn Header="Larghezza"
|
||||
Binding="{Binding dWidth}"
|
||||
Width="Auto"/>
|
||||
<DataGridTextColumn Header="Height"
|
||||
Width="Auto"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Altezza"
|
||||
Binding="{Binding dHeight}"
|
||||
Width="Auto"/>
|
||||
<DataGridTextColumn Header="Thickness"
|
||||
Width="Auto"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Spessore"
|
||||
Binding="{Binding dThickness}"
|
||||
Width="Auto"/>
|
||||
<DataGridTextColumn Header="State"
|
||||
Width="Auto"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTemplateColumn Header="Apertura"
|
||||
Width="Auto">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock Text="{Binding SelSwing.Name}"
|
||||
Style="{StaticResource DataGridTextColumn_TextBlock}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
<DataGridTemplateColumn.CellEditingTemplate>
|
||||
<DataTemplate>
|
||||
<ComboBox ItemsSource="{Binding SwingList}"
|
||||
SelectedItem="{Binding SelSwing}"
|
||||
SelectedValuePath="Name"
|
||||
Style="{StaticResource DataGridTemplateColumn_ComboBox}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellEditingTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Header="Stato"
|
||||
Binding="{Binding nState}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="Csv"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="CSV"
|
||||
Binding="{Binding sCSVName}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="Line"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Linea del CSV"
|
||||
Binding="{Binding nCSVLine}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="Production State"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Stato di produzione"
|
||||
Binding="{Binding nProdState}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="Load Time"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Carico"
|
||||
Binding="{Binding sLoadTime}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="Machining 1 Start"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Inizio lavorazione"
|
||||
Binding="{Binding sMachining1Start}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="Machining 1 End"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Fine lavorazione"
|
||||
Binding="{Binding sMachining1End}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
<!--<DataGridTextColumn Header="Machining 2 Start"
|
||||
Binding="{Binding sMachining2Start}"
|
||||
Width="Auto"/>
|
||||
<DataGridTextColumn Header="Machining 2 End"
|
||||
Binding="{Binding sMachining2End}"
|
||||
Width="Auto"/>-->
|
||||
<DataGridTextColumn Header="Unload Time"
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
<DataGridTextColumn Header="Scarico"
|
||||
Binding="{Binding sUnloadTime}"
|
||||
Width="Auto"
|
||||
IsReadOnly="True"/>
|
||||
IsReadOnly="True"
|
||||
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||
</DataGrid.Columns>
|
||||
<!--<DataGrid.InputBindings>
|
||||
<KeyBinding Key="Delete" Command="{Binding Tag.SelectedMachGroup.DeleteMachGroup_Command,
|
||||
RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
|
||||
</DataGrid.InputBindings>-->
|
||||
<DataGrid.RowStyle>
|
||||
<Style TargetType="DataGridRow">
|
||||
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
|
||||
<Setter Property="Background" Value="{Binding Background}"/>
|
||||
<Setter Property="BorderBrush" Value="{Binding nState, Converter={StaticResource StateToSelColorConverter}}" />
|
||||
</Style>
|
||||
</DataGrid.RowStyle>
|
||||
|
||||
<DataGrid.CellStyle>
|
||||
<Style TargetType="{x:Type DataGridCell}">
|
||||
<!--<Setter Property="VerticalAlignment" Value="Stretch"/>
|
||||
--><!--<Setter Property="VerticalContentAlignment" Value="Center"/>-->
|
||||
<!--<Setter Property="TextBlock.TextAlignment" Value="Center"/>
|
||||
<Setter Property="TextBox.VerticalAlignment" Value="Stretch"/>--><!--
|
||||
<Setter Property="TextBox.VerticalContentAlignment" Value="Center"/>-->
|
||||
<!--<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type DataGridCell}">
|
||||
<Grid>
|
||||
<TextBox Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
|
||||
VerticalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch"
|
||||
HorizontalContentAlignment="Center"
|
||||
BorderThickness="0"
|
||||
Background="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Background}"
|
||||
VerticalContentAlignment="Center">
|
||||
<TextBox.Style>
|
||||
<Style TargetType="{x:Type TextBox}">
|
||||
</Style>
|
||||
</TextBox.Style>
|
||||
</TextBox>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>-->
|
||||
<!--<Setter Property="TextBlock.TextAlignment" Value="Center"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type DataGridCell}">
|
||||
<Grid Background="{TemplateBinding Background}">
|
||||
<ContentPresenter>
|
||||
<ContentPresenter.Style>
|
||||
<Style TargetType="ContentPresenter">
|
||||
<Setter Property="TextBox.VerticalAlignment" Value="Stretch"/>
|
||||
<Setter Property="TextBox.VerticalContentAlignment" Value="Center"/>
|
||||
</Style>
|
||||
</ContentPresenter.Style>
|
||||
</ContentPresenter>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>-->
|
||||
<!--<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type DataGridCell}">
|
||||
<Border VerticalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch">
|
||||
<ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>-->
|
||||
<!--<Style.Resources>
|
||||
<Style TargetType="ContentPresenter">
|
||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
||||
<Setter Property="TextBox.VerticalAlignment" Value="Center" />
|
||||
</Style>
|
||||
</Style.Resources>
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
</Trigger>
|
||||
</Style.Triggers>-->
|
||||
</Style>
|
||||
</DataGrid.CellStyle>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -98,6 +98,10 @@
|
||||
<DependentUpon>DoorListPageV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DoorListPage\DoorListPageVM.vb" />
|
||||
<Compile Include="MultipleCopyWnd\MultipleCopyWndV.xaml.vb">
|
||||
<DependentUpon>MultipleCopyWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="MultipleCopyWnd\MultipleCopyWndVM.vb" />
|
||||
<Compile Include="ProcessManager\ProcessManagerV.xaml.vb">
|
||||
<DependentUpon>ProcessManagerV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -160,12 +164,18 @@
|
||||
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
||||
</None>
|
||||
<None Include="packages.config" />
|
||||
<Resource Include="Resources\Fonts\Roboto-Light.ttf" />
|
||||
<Resource Include="Resources\Fonts\Roboto-Regular.ttf" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="DoorListPage\DoorListPageV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="MultipleCopyWnd\MultipleCopyWndV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ProcessManager\ProcessManagerV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:Effector.Plugin.DoorArreda"
|
||||
DataContext="{StaticResource FiveLakesUIVM}">
|
||||
<TabControl SelectedIndex="{Binding SelPage}">
|
||||
<TabControl SelectedIndex="{Binding SelPage}"
|
||||
Style="{StaticResource MainPage_Tabcontrol}">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style TargetType="TabItem">
|
||||
<Setter Property="Visibility" Value="Collapsed" />
|
||||
|
||||
@@ -110,8 +110,17 @@ Public Module Lua_General
|
||||
' restituisco il risultato
|
||||
LuaSetParam(state, NextDoor.nId)
|
||||
LuaSetParam(state, If(Not String.IsNullOrWhiteSpace(Path.GetDirectoryName(NextDoor.sDDFName)), Path.GetDirectoryName(NextDoor.sDDFName) & "_", "") & Path.GetFileNameWithoutExtension(NextDoor.sDDFName) & "_" & NextDoor.nId & ".ddf")
|
||||
'LuaSetParam(state, Path.GetFileNameWithoutExtension(NextDoor.sDDFName) & "_" & NextDoor.nId & ".ddf")
|
||||
Return 2
|
||||
Dim sPhaseHeader As String = ""
|
||||
GetPluginPrivateProfileString(S_CSV, K_PHASE, "", sPhaseHeader)
|
||||
Dim PhaseParameter As CustomerParameter = NextDoor.CustomerParameters.FirstOrDefault(Function(x) x.sHeader = sPhaseHeader)
|
||||
Dim nPhase As Integer = 0
|
||||
If Not IsNothing(PhaseParameter) Then
|
||||
If Not Integer.TryParse(PhaseParameter.sValue, nPhase) Then
|
||||
nPhase = 0
|
||||
End If
|
||||
End If
|
||||
LuaSetParam(state, nPhase)
|
||||
Return 3
|
||||
End If
|
||||
Return 0
|
||||
End Function
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<RadioButton Content="Lista Porte"
|
||||
<RadioButton Content="LISTA PORTE"
|
||||
Command="{Binding Page_Command}"
|
||||
CommandParameter="{StaticResource Door_List}"
|
||||
IsChecked="True"
|
||||
Style="{StaticResource {x:Type ToggleButton}}"/>
|
||||
Style="{StaticResource MainMenu_ToggleButton}"/>
|
||||
<RadioButton Grid.Column="1"
|
||||
Content="Machine Status"
|
||||
Content="STATO MACCHINA"
|
||||
Command="{Binding Page_Command}"
|
||||
CommandParameter="{StaticResource Machine_State}"
|
||||
Style="{StaticResource {x:Type ToggleButton}}"/>
|
||||
Style="{StaticResource MainMenu_ToggleButton}"/>
|
||||
<!--<RadioButton Grid.Column="2"
|
||||
Content="Statistics"
|
||||
Command="{Binding Page_Command}"
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<Window x:Class="MultipleCopyWndV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Height="200"
|
||||
Width="400">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Numero di copie"/>
|
||||
<TextBox Grid.Column="1"
|
||||
Text="{Binding sCopyNumber}"/>
|
||||
</Grid>
|
||||
<Button Grid.Row="1"
|
||||
Content="Ok"
|
||||
Command="{Binding Ok_Command}"/>
|
||||
</Grid>
|
||||
|
||||
</Window>
|
||||
@@ -0,0 +1,19 @@
|
||||
Public Class MultipleCopyWndV
|
||||
|
||||
Private WithEvents m_MultipleCopyWndVM As MultipleCopyWndVM
|
||||
|
||||
Sub New(Owner As Window, MultipleCopyWndVM As MultipleCopyWndVM)
|
||||
'MyBase.New(Owner)
|
||||
Me.Owner = Owner
|
||||
' This call is required by the designer.
|
||||
InitializeComponent()
|
||||
Me.DataContext = MultipleCopyWndVM
|
||||
' Assegno al riferimento locale al VM il VM preso dal DataContext
|
||||
m_MultipleCopyWndVM = MultipleCopyWndVM
|
||||
End Sub
|
||||
|
||||
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MultipleCopyWndVM.m_CloseWindow
|
||||
Me.DialogResult = bDialogResult
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,48 @@
|
||||
Public Class MultipleCopyWndVM
|
||||
Inherits VMBase
|
||||
|
||||
Friend Event m_CloseWindow(bDialogResult As Boolean)
|
||||
|
||||
Private m_nCopyNumber As Integer
|
||||
Public ReadOnly Property nCopyNumber As Integer
|
||||
Get
|
||||
Return m_nCopyNumber
|
||||
End Get
|
||||
End Property
|
||||
Public Property sCopyNumber As String
|
||||
Get
|
||||
Return m_nCopyNumber.ToString()
|
||||
End Get
|
||||
Set(value As String)
|
||||
If Not Integer.TryParse(value, m_nCopyNumber) Then
|
||||
MessageBox.Show("Valore non impostabile come quantita' di porte!", "Errore!", MessageBoxButton.OK, MessageBoxImage.Error)
|
||||
NotifyPropertyChanged(sCopyNumber)
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdOk As ICommand
|
||||
|
||||
#Region "COMMANDS"
|
||||
|
||||
#Region "Ok"
|
||||
|
||||
Public ReadOnly Property Ok_Command As ICommand
|
||||
Get
|
||||
If m_cmdOk Is Nothing Then
|
||||
m_cmdOk = New Command(AddressOf Ok)
|
||||
End If
|
||||
Return m_cmdOk
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Ok()
|
||||
If m_nCopyNumber > 0 Then RaiseEvent m_CloseWindow(True)
|
||||
End Sub
|
||||
|
||||
#End Region ' Ok
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
@@ -2,8 +2,7 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:Effector.Plugin.DoorArreda"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
>
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib">
|
||||
|
||||
<!--
|
||||
Assign a Key to every Panel ViewModel to use
|
||||
@@ -16,35 +15,91 @@
|
||||
<local:StatisticsPageVM x:Key="StatisticsPageVM"/>
|
||||
|
||||
<!--Colori predefiniti-->
|
||||
|
||||
<!--#92bde3-->
|
||||
<Color x:Key="Effector_LightBlue_Color" R="146" G="189" B="227" A="255"/>
|
||||
|
||||
<!--#e8eef5-->
|
||||
<Color x:Key="Effector_LightBlue_Color" R="232" G="238" B="245" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_LightBlue" Color="{StaticResource Effector_LightBlue_Color}" />
|
||||
<!--#5682a6-->
|
||||
<Color x:Key="Effector_Blue_Color" R="86" G="130" B="166" A="255"/>
|
||||
<!--#afc5d6-->
|
||||
<Color x:Key="Effector_Blue_Color" R="175" G="197" B="214" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Blue" Color="{StaticResource Effector_Blue_Color}" />
|
||||
<!--#749fc4-->
|
||||
<Color x:Key="Effector_DarkBlue_Color" R="116" G="159" B="196" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_DarkBlue" Color="{StaticResource Effector_DarkBlue_Color}" />
|
||||
|
||||
|
||||
<!--#92bde3-->
|
||||
<Color x:Key="Effector_LightBlue_Status_Color" R="146" G="189" B="227" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_LightBlue_Status" Color="{StaticResource Effector_LightBlue_Status_Color}" />
|
||||
<!--#5682a6-->
|
||||
<Color x:Key="Effector_Blue_Status_Color" R="86" G="130" B="166" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Blue_Status" Color="{StaticResource Effector_Blue_Status_Color}" />
|
||||
<!--#cd5c5c-->
|
||||
<Color x:Key="Effector_Red_Color" R="205" G="92" B="92" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Red" Color="{StaticResource Effector_Red_Color}" />
|
||||
<Color x:Key="Effector_Red_Status_Color" R="205" G="92" B="92" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Red_Status" Color="{StaticResource Effector_Red_Status_Color}" />
|
||||
<!--#b1cbaa-->
|
||||
<Color x:Key="Effector_Green_Color" R="177" G="203" B="170" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Green" Color="{StaticResource Effector_Green_Color}" />
|
||||
<Color x:Key="Effector_Green_Status_Color" R="177" G="203" B="170" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Green_Status" Color="{StaticResource Effector_Green_Status_Color}" />
|
||||
<!--#9c9c9c-->
|
||||
<Color x:Key="Effector_Gray_Color" R="156" G="156" B="156" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Gray" Color="{StaticResource Effector_Gray_Color}" />
|
||||
<Color x:Key="Effector_Gray_Status_Color" R="156" G="156" B="156" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Gray_Status" Color="{StaticResource Effector_Gray_Status_Color}" />
|
||||
<!--#ffd932-->
|
||||
<Color x:Key="Effector_Yellow_Color" R="255" G="217" B="50" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Yellow" Color="{StaticResource Effector_Yellow_Color}" />
|
||||
<Color x:Key="Effector_Yellow_Status_Color" R="255" G="217" B="50" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Yellow_Status" Color="{StaticResource Effector_Yellow_Status_Color}" />
|
||||
|
||||
<!--#6398c7-->
|
||||
<Color x:Key="Effector_LightBlue_SelStatus_Color" R="99" G="152" B="199" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_LightBlue_SelStatus" Color="{StaticResource Effector_LightBlue_SelStatus_Color}" />
|
||||
<!--#4b677e-->
|
||||
<Color x:Key="Effector_Blue_SelStatus_Color" R="75" G="103" B="126" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Blue_SelStatus" Color="{StaticResource Effector_Blue_SelStatus_Color}" />
|
||||
<!--#a94444-->
|
||||
<Color x:Key="Effector_Red_SelStatus_Color" R="169" G="68" B="68" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Red_SelStatus" Color="{StaticResource Effector_Red_SelStatus_Color}" />
|
||||
<!--#89aa81-->
|
||||
<Color x:Key="Effector_Green_SelStatus_Color" R="137" G="170" B="129" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Green_SelStatus" Color="{StaticResource Effector_Green_SelStatus_Color}" />
|
||||
<!--#7d7d7d-->
|
||||
<Color x:Key="Effector_Gray_SelStatus_Color" R="125" G="125" B="125" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Gray_SelStatus" Color="{StaticResource Effector_Gray_SelStatus_Color}" />
|
||||
<!--#dcb718-->
|
||||
<Color x:Key="Effector_Yellow_SelStatus_Color" R="220" G="183" B="24" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Yellow_SelStatus" Color="{StaticResource Effector_Yellow_SelStatus_Color}" />
|
||||
<!--#e5ebf1-->
|
||||
<Color x:Key="Effector_White_SelStatus_Color" R="229" G="235" B="241" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_White_SelStatus" Color="{StaticResource Effector_Yellow_SelStatus_Color}" />
|
||||
|
||||
<!--#BC373E--><!--
|
||||
<Color x:Key="Effector_Orange_Color" R="188" G="55" B="62" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Orange" Color="{StaticResource Effector_Orange_Color}" />
|
||||
--><!--#A74C77--><!--
|
||||
<SolidColorBrush x:Key="Effector_Orange" Color="{StaticResource Effector_Orange_Color}" />-->
|
||||
<!--#A74C77--><!--
|
||||
<Color x:Key="Effector_Purple_Color" R="167" G="76" B="119" A="255"/>
|
||||
<SolidColorBrush x:Key="Effector_Purple" Color="{StaticResource Effector_Purple_Color}" />-->
|
||||
|
||||
<!--Colori per EgtWPFLib5-->
|
||||
<SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
|
||||
|
||||
<!--Colori default dei controlli-->
|
||||
<SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
|
||||
<SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
|
||||
<SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
|
||||
<SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
|
||||
<SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6"/>
|
||||
<SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
|
||||
<SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
|
||||
<SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
|
||||
<SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
|
||||
|
||||
<Style x:Key="FocusVisual">
|
||||
<Setter Property="Control.Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate>
|
||||
<Rectangle Margin="2" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
|
||||
<!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
|
||||
<!--o viene eseguito un lua che non aggiorna l'interfaccia-->
|
||||
<PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
|
||||
@@ -56,10 +111,100 @@
|
||||
<Thickness x:Key="WindowBorder_Thickness">2</Thickness>
|
||||
<sys:Double x:Key="WindowBorder_Height">2</sys:Double>
|
||||
|
||||
<!--ToggleButton-->
|
||||
<Style x:Key="MainMenu_ToggleButton" TargetType="ToggleButton">
|
||||
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
|
||||
<!--Button-->
|
||||
|
||||
<Style TargetType="{x:Type Button}">
|
||||
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
|
||||
<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="Padding" Value="1"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type Button}">
|
||||
<Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
|
||||
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsDefaulted" Value="true">
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="true">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="true">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="false">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
|
||||
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="DoorList_Button" TargetType="{x:Type Button}">
|
||||
<Setter Property="Height" Value="30"/>
|
||||
<Setter Property="Padding" Value="10,0,10,0"/>
|
||||
</Style>
|
||||
<!--ToggleButton-->
|
||||
|
||||
<Style TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
|
||||
<Setter Property="Background" Value="{StaticResource Effector_Blue}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="Padding" Value="1"/>
|
||||
<Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
|
||||
<Setter Property="FontWeight" Value="Medium"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToggleButton}">
|
||||
<Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
|
||||
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="Button.IsDefaulted" Value="true">
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="true">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="true">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsChecked" Value="true">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Effector_DarkBlue}"/>
|
||||
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="false">
|
||||
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
|
||||
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
|
||||
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="MainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
|
||||
<Setter Property="Padding" Value="25,0,25,0"/>
|
||||
</Style>
|
||||
|
||||
<!--Stili per disegno macchina con porte-->
|
||||
|
||||
<Style x:Key="Table" TargetType="Border">
|
||||
@@ -96,5 +241,50 @@
|
||||
<Setter Property="BorderBrush" Value="DarkGray"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<!-- Custom SelectedItem colors for DataGrid -->
|
||||
|
||||
<Style x:Key="RowDataGrid_CustomHighLight" TargetType="{x:Type DataGridRow}">
|
||||
<Setter Property="BorderBrush" Value="LightGray" />
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="BorderThickness" Value="2,2,2,2" />
|
||||
<!--<Setter Property="BorderBrush" Value="Cyan" />-->
|
||||
<Setter Property="Padding" Value="0,0,0,0" />
|
||||
<Setter Property="Margin" Value="-2,0,-2,0" />
|
||||
<Setter Property="Foreground" Value="Blue" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
<Style.Resources>
|
||||
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
|
||||
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
|
||||
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
|
||||
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
|
||||
</Style.Resources>
|
||||
</Style>
|
||||
|
||||
<!--Styles for DataGrid columns-->
|
||||
|
||||
<Style x:Key="DataGridTextColumn_TextBlock" TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="TextAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="DataGridTextColumn_TextBox" TargetType="{x:Type TextBox}">
|
||||
<Setter Property="TextAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
</Style>
|
||||
<Style x:Key="DataGridTemplateColumn_ComboBox" TargetType="{x:Type ComboBox}">
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<!--Style for page tabcontrol-->
|
||||
|
||||
<Style x:Key="MainPage_Tabcontrol" TargetType="{x:Type TabControl}">
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="Margin" Value="0"/>
|
||||
<Setter Property="Padding" Value="0"/>
|
||||
</Style>
|
||||
|
||||
</ResourceDictionary>
|
||||
|
||||
@@ -12,13 +12,6 @@ Public Class Dictionary
|
||||
|
||||
#Region "Colors"
|
||||
|
||||
'Private m_Omag_Red As SolidColorBrush = Brushes.Red
|
||||
'Public ReadOnly Property Omag_Red As SolidColorBrush
|
||||
' Get
|
||||
' Return m_Omag_Red
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Private Shared m_Button_Static_Background As SolidColorBrush = New BrushConverter().ConvertFrom("#FFDDDDDD")
|
||||
'Public Shared ReadOnly Property Button_Static_Background As SolidColorBrush
|
||||
' Get
|
||||
@@ -34,14 +27,126 @@ Public Class Dictionary
|
||||
'End Property
|
||||
|
||||
|
||||
'Private Shared m_Icarus_Gray As SolidColorBrush = Application.Current.FindResource("Icarus_Gray")
|
||||
'Public Shared ReadOnly Property Icarus_Gray As SolidColorBrush
|
||||
Private Shared m_Effector_LightBlue As SolidColorBrush = Application.Current.FindResource("Effector_LightBlue")
|
||||
Public Shared ReadOnly Property Effector_LightBlue As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_LightBlue
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Blue As SolidColorBrush = Application.Current.FindResource("Effector_Blue")
|
||||
Public Shared ReadOnly Property Effector_Blue As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Blue
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_DarkBlue As SolidColorBrush = Application.Current.FindResource("Effector_DarkBlue")
|
||||
Public Shared ReadOnly Property Effector_DarkBlue As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_DarkBlue
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_LightBlue_Status As SolidColorBrush = Application.Current.FindResource("Effector_LightBlue_Status")
|
||||
Public Shared ReadOnly Property Effector_LightBlue_Status As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_LightBlue_Status
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Blue_Status As SolidColorBrush = Application.Current.FindResource("Effector_Blue_Status")
|
||||
Public Shared ReadOnly Property Effector_Blue_Status As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Blue_Status
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Red_Status As SolidColorBrush = Application.Current.FindResource("Effector_Red_Status")
|
||||
Public Shared ReadOnly Property Effector_Red_Status As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Red_Status
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Green_Status As SolidColorBrush = Application.Current.FindResource("Effector_Green_Status")
|
||||
Public Shared ReadOnly Property Effector_Green_Status As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Green_Status
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Gray_Status As SolidColorBrush = Application.Current.FindResource("Effector_Gray_Status")
|
||||
Public Shared ReadOnly Property Effector_Gray_Status As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Gray_Status
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Yellow_Status As SolidColorBrush = Application.Current.FindResource("Effector_Yellow_Status")
|
||||
Public Shared ReadOnly Property Effector_Yellow_Status As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Yellow_Status
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_LightBlue_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_LightBlue_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_LightBlue_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_LightBlue_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Blue_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_Blue_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_Blue_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Blue_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Red_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_Red_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_Red_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Red_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Green_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_Green_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_Green_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Green_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Gray_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_Gray_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_Gray_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Gray_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_Yellow_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_Yellow_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_Yellow_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_Yellow_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private Shared m_Effector_White_SelStatus As SolidColorBrush = Application.Current.FindResource("Effector_White_SelStatus")
|
||||
Public Shared ReadOnly Property Effector_White_SelStatus As SolidColorBrush
|
||||
Get
|
||||
Return m_Effector_White_SelStatus
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'Private Shared m_Effector_Orange As SolidColorBrush = Application.Current.FindResource("Effector_Orange")
|
||||
'Public Shared ReadOnly Property Effector_Orange As SolidColorBrush
|
||||
' Get
|
||||
' Return m_Icarus_Gray
|
||||
' Return m_Effector_Orange
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Private Shared m_Icarus_LightBlue As SolidColorBrush = Application.Current.FindResource("Icarus_LightBlue")
|
||||
'Private Shared m_Icarus_LightBlue As SolidColorBrush = Application.Current.FindResource("Effector_LightBlue_Color")
|
||||
'Public Shared ReadOnly Property Icarus_LightBlue As SolidColorBrush
|
||||
' Get
|
||||
' Return m_Icarus_LightBlue
|
||||
@@ -62,12 +167,6 @@ Public Class Dictionary
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Private Shared m_Icarus_Orange As SolidColorBrush = Application.Current.FindResource("Icarus_Orange")
|
||||
'Public Shared ReadOnly Property Icarus_Orange As SolidColorBrush
|
||||
' Get
|
||||
' Return m_Icarus_Orange
|
||||
' End Get
|
||||
'End Property
|
||||
|
||||
'Private Shared m_Icarus_Purple As SolidColorBrush = Application.Current.FindResource("Icarus_Purple")
|
||||
'Public Shared ReadOnly Property Icarus_Purple As SolidColorBrush
|
||||
|
||||
@@ -61,6 +61,13 @@ Public Class JsonDoor
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_nSwing As Integer
|
||||
Public ReadOnly Property nSwing As Integer
|
||||
Get
|
||||
Return m_nSwing
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_sCSVName As String
|
||||
Public ReadOnly Property sCSVName As String
|
||||
Get
|
||||
@@ -140,7 +147,7 @@ Public Class JsonDoor
|
||||
#End Region ' Statistics
|
||||
|
||||
<JsonConstructor>
|
||||
Sub New(nListIndex As Integer, nId As Integer, nCSVLine As Integer, sDDFName As String, sCSVName As String, nQuantity As Integer, dWidth As Double, dHeight As Double, dThickness As Double, nState As DoorStates, CustomerParameters As List(Of CustomerParameter),
|
||||
Sub New(nListIndex As Integer, nId As Integer, nCSVLine As Integer, sDDFName As String, sCSVName As String, nQuantity As Integer, dWidth As Double, dHeight As Double, dThickness As Double, nSwing As Integer, nState As DoorStates, CustomerParameters As List(Of CustomerParameter),
|
||||
nProdState As DoorProdStates, dtLoadTime As DateTime, dtMachining1Start As DateTime, dtMachining1End As DateTime, dtMachining2Start As DateTime, dtMachining2End As DateTime, dtUnloadTime As DateTime)
|
||||
m_nListIndex = nListIndex
|
||||
m_nId = nId
|
||||
@@ -151,6 +158,7 @@ Public Class JsonDoor
|
||||
m_dHeight = dHeight
|
||||
m_dWidth = dWidth
|
||||
m_dThickness = dThickness
|
||||
m_nSwing = nSwing
|
||||
m_nState = nState
|
||||
m_CustomerParameters = CustomerParameters
|
||||
m_nProdState = nProdState
|
||||
@@ -172,6 +180,7 @@ Public Class JsonDoor
|
||||
m_dHeight = Door.dHeight
|
||||
m_dWidth = Door.dWidth
|
||||
m_dThickness = Door.dThickness
|
||||
m_nSwing = Door.nSwing
|
||||
m_nState = Door.nState
|
||||
m_CustomerParameters = Door.CustomerParameters
|
||||
m_nProdState = Door.nProdState
|
||||
|
||||
Reference in New Issue
Block a user