Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc8db8efbe | |||
| 44815f86fa | |||
| 2079fe7707 | |||
| 3630a232d8 |
@@ -9,6 +9,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.Interface",
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.FiveLakes", "Effector.Plugin.FiveLakes\Effector.Plugin.FiveLakes.vbproj", "{7C77F537-8235-40AB-B24A-4E71CFB96D2C}"
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.FiveLakes", "Effector.Plugin.FiveLakes\Effector.Plugin.FiveLakes.vbproj", "{7C77F537-8235-40AB-B24A-4E71CFB96D2C}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Effector.Plugin.Lib", "..\Effector.Plugin.Lib\Effector.Plugin.Lib\Effector.Plugin.Lib.vbproj", "{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -55,6 +57,18 @@ Global
|
|||||||
{7C77F537-8235-40AB-B24A-4E71CFB96D2C}.Release|x64.Build.0 = Release|Any CPU
|
{7C77F537-8235-40AB-B24A-4E71CFB96D2C}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{7C77F537-8235-40AB-B24A-4E71CFB96D2C}.Release|x86.ActiveCfg = Release|Any CPU
|
{7C77F537-8235-40AB-B24A-4E71CFB96D2C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{7C77F537-8235-40AB-B24A-4E71CFB96D2C}.Release|x86.Build.0 = Release|Any CPU
|
{7C77F537-8235-40AB-B24A-4E71CFB96D2C}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{E5ECC5E1-EA7B-447D-9A07-F5EE25D27779}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -15,10 +15,14 @@ Module ConstIni
|
|||||||
Public Const INI_FILE_NAME As String = "Effector.Plugin.FiveLakes.ini"
|
Public Const INI_FILE_NAME As String = "Effector.Plugin.FiveLakes.ini"
|
||||||
|
|
||||||
Public Const S_GENERAL As String = "General"
|
Public Const S_GENERAL As String = "General"
|
||||||
|
Public Const K_CAMEXEPATH As String = "CAMExePath"
|
||||||
|
Public Const K_DOORCREATOREXEPATH As String = "DoorCreatorExePath"
|
||||||
Public Const K_BACKUPDIR As String = "BackupDir"
|
Public Const K_BACKUPDIR As String = "BackupDir"
|
||||||
Public Const K_RESOURCESDIR As String = "ResourcesDir"
|
Public Const K_RESOURCESDIR As String = "ResourcesDir"
|
||||||
Public Const K_DDFDIR As String = "DDFDir"
|
Public Const K_DDFDIR As String = "DDFDir"
|
||||||
|
Public Const K_DDTDIR As String = "DDTDir"
|
||||||
Public Const K_GENDDFDIR As String = "GenDDFDir"
|
Public Const K_GENDDFDIR As String = "GenDDFDir"
|
||||||
|
Public Const K_CSVOUTPUT As String = "CSVOutput"
|
||||||
|
|
||||||
Public Const S_CSV As String = "CSV"
|
Public Const S_CSV As String = "CSV"
|
||||||
Public Const K_DDFNAME As String = "DDFName"
|
Public Const K_DDFNAME As String = "DDFName"
|
||||||
@@ -26,6 +30,12 @@ Module ConstIni
|
|||||||
Public Const K_HEIGHT As String = "Height"
|
Public Const K_HEIGHT As String = "Height"
|
||||||
Public Const K_WIDTH As String = "Width"
|
Public Const K_WIDTH As String = "Width"
|
||||||
Public Const K_THICKNESS As String = "Thickness"
|
Public Const K_THICKNESS As String = "Thickness"
|
||||||
|
Public Const K_SWING As String = "Swing"
|
||||||
|
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"
|
Public Const K_DELIMITER As String = "Delimiter"
|
||||||
|
|
||||||
Public Const S_DEBUG As String = "Debug"
|
Public Const S_DEBUG As String = "Debug"
|
||||||
|
|||||||
@@ -1,103 +1,301 @@
|
|||||||
<Grid x:Class="DoorListPageV"
|
<Grid x:Class="DoorListPageV"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:local="clr-namespace:Effector.Plugin.FiveLakes">
|
||||||
|
<Grid.Resources>
|
||||||
|
<local:StateToSelColorConverter x:Key="StateToSelColorConverter"/>
|
||||||
|
<local:DDTListToBooleanConverter x:Key="DDTListToBooleanConverter"/>
|
||||||
|
</Grid.Resources>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="3"/>
|
||||||
<RowDefinition Height="1*"/>
|
<RowDefinition Height="1*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<StackPanel Orientation="Horizontal">
|
<Border BorderThickness="0"
|
||||||
<Button Content="CSV"
|
Padding="3"
|
||||||
ToolTip="Open CSV file"
|
BorderBrush="Transparent"
|
||||||
Command="{Binding OpenCSV_Command}"
|
Background="{StaticResource Effector_DarkBlue}">
|
||||||
IsEnabled="{Binding bExecButton_IsEnabled}"/>
|
<StackPanel Orientation="Horizontal"
|
||||||
<Button Content="Skip Door"
|
Background="{StaticResource Effector_DarkBlue}">
|
||||||
ToolTip="Skip Door"
|
<Button ToolTip="Open CSV file"
|
||||||
Command="{Binding SkipDoor_Command}"/>
|
Command="{Binding OpenCSV_Command}"
|
||||||
<Button Content="↑"
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
ToolTip="Move Up"
|
Style="{StaticResource DoorList_Button}">
|
||||||
Command="{Binding MoveUp_Command}"/>
|
<Image Source="../Resources/DoorListPage/OpenCsv.png"
|
||||||
<Button Content="↓"
|
Style="{StaticResource Button_Image}"/>
|
||||||
ToolTip="Move Down"
|
</Button>
|
||||||
Command="{Binding MoveDown_Command}"/>
|
<Button ToolTip="Delete CSV file"
|
||||||
<Button Content="Delete"
|
Command="{Binding DeleteAll_Command}"
|
||||||
ToolTip="Delete"
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
Command="{Binding Delete_Command}"/>
|
Style="{StaticResource DoorList_Button}">
|
||||||
<Button Content="Delete All"
|
<Image Source="../Resources/DoorListPage/DeleteCsv.png"
|
||||||
ToolTip="Delete All"
|
Style="{StaticResource Button_Image}"/>
|
||||||
Command="{Binding DeleteAll_Command}"/>
|
</Button>
|
||||||
<Button Content="Produce"
|
<Button ToolTip="Send selected door to production"
|
||||||
ToolTip="Send to production"
|
Command="{Binding Produce_Command}"
|
||||||
Command="{Binding Produce_Command}"/>
|
Style="{StaticResource DoorList_Button}">
|
||||||
<Button Content="Produce All"
|
<Image Source="../Resources/DoorListPage/Produce.png"
|
||||||
ToolTip="Send all to production"
|
Style="{StaticResource Button_Image}"/>
|
||||||
Command="{Binding ProduceAll_Command}"/>
|
</Button>
|
||||||
<Button Content="Reset Production Queue"
|
<Button ToolTip="Send all to production"
|
||||||
ToolTip="Take all the door ready for production back to Verify state"
|
Command="{Binding ProduceAll_Command}"
|
||||||
Command="{Binding ResetProductionQueue_Command}"/>
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
<Button Content="Verify"
|
Style="{StaticResource DoorList_Button}">
|
||||||
ToolTip="Verify all the doors that are in state Not Verified"
|
<Image Source="../Resources/DoorListPage/ProduceAll.png"
|
||||||
Command="{Binding Verify_Command}"
|
Style="{StaticResource Button_Image}"/>
|
||||||
IsEnabled="{Binding bExecButton_IsEnabled}"/>
|
</Button>
|
||||||
</StackPanel>
|
<Button ToolTip="Take all the door ready for production back to Verify state"
|
||||||
<DataGrid Grid.Row="1"
|
Command="{Binding ResetProductionQueue_Command}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/ResetProduction.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Move Up"
|
||||||
|
Command="{Binding MoveUp_Command}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/MoveUp.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Move Down"
|
||||||
|
Command="{Binding MoveDown_Command}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/MoveDown.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<!--<Button ToolTip="Skip selected door, which will not be sent to production"
|
||||||
|
Command="{Binding SkipDoor_Command}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/SkipDoor.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>-->
|
||||||
|
<Button ToolTip="Mark the selected door as not to be produced"
|
||||||
|
Command="{Binding NotProduceDoor_Command}"
|
||||||
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/NotProduce.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Add a new door to the list"
|
||||||
|
Command="{Binding AddDoor_Command}"
|
||||||
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/Add.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Copy the selected door"
|
||||||
|
Command="{Binding CopyDoor_Command}"
|
||||||
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/Copy.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Multiple copy the selected door"
|
||||||
|
Command="{Binding MultipleCopyDoor_Command}"
|
||||||
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/MultipleCopy.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Delete door"
|
||||||
|
Command="{Binding Delete_Command}"
|
||||||
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/Delete.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<Button ToolTip="Verify all the doors that are in state Not Verified"
|
||||||
|
Command="{Binding Verify_Command}"
|
||||||
|
IsEnabled="{Binding bExecButton_IsEnabled}"
|
||||||
|
Style="{StaticResource DoorList_Button}">
|
||||||
|
<Image Source="../Resources/DoorListPage/Verify.png"
|
||||||
|
Style="{StaticResource Button_Image}"/>
|
||||||
|
</Button>
|
||||||
|
<TextBlock Text="{Binding sExecPercentage}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="10,0,5,0"
|
||||||
|
Visibility="{Binding ExecPercentage_Visibility, Mode=OneWay}"/>
|
||||||
|
<ProgressBar Minimum="0"
|
||||||
|
Maximum="100"
|
||||||
|
Value="{Binding dExecPercentage, Mode=OneWay}"
|
||||||
|
Height="15"
|
||||||
|
Width="100"
|
||||||
|
Margin="5,0,0,0"
|
||||||
|
Visibility="{Binding ExecPercentage_Visibility}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
<FrameworkElement x:Name="dummyElement" Visibility="Collapsed"/>
|
||||||
|
<DataGrid Grid.Row="2"
|
||||||
ItemsSource="{Binding DoorList}"
|
ItemsSource="{Binding DoorList}"
|
||||||
SelectedItem="{Binding SelDoor}"
|
SelectedItem="{Binding SelDoor}"
|
||||||
AutoGenerateColumns="False"
|
AutoGenerateColumns="False"
|
||||||
|
CanUserDeleteRows="False"
|
||||||
|
CanUserResizeRows="False"
|
||||||
|
SelectionMode="Single"
|
||||||
|
SelectionUnit="FullRow"
|
||||||
CanUserSortColumns="False"
|
CanUserSortColumns="False"
|
||||||
SelectionMode="Single">
|
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||||
|
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||||
|
HorizontalGridLinesBrush="Transparent"
|
||||||
|
VerticalGridLinesBrush="Transparent"
|
||||||
|
ColumnHeaderHeight="32"
|
||||||
|
HeadersVisibility="Column"
|
||||||
|
FontSize="12"
|
||||||
|
FontFamily="/Resources/Fonts/#Roboto"
|
||||||
|
FontWeight="Regular"
|
||||||
|
RowHeight="32"
|
||||||
|
BorderThickness="0">
|
||||||
|
<DataGrid.Resources>
|
||||||
|
<DataTemplate x:Key="DDTTemplate">
|
||||||
|
<ComboBox IsEditable="True"
|
||||||
|
Text="{Binding DataContext.sDDFName, RelativeSource={RelativeSource AncestorType={x:Type ContentControl}}, UpdateSourceTrigger=LostFocus}"
|
||||||
|
ItemsSource="{Binding DataContext.DDTList, RelativeSource={RelativeSource AncestorType={x:Type local:DoorListPageV}}}"
|
||||||
|
Style="{StaticResource DataGridTemplateColumn_ComboBox}"/>
|
||||||
|
</DataTemplate>
|
||||||
|
<DataTemplate x:Key="NoDDTTemplate">
|
||||||
|
<TextBox Text="{Binding DataContext.sDDFName, RelativeSource={RelativeSource AncestorType={x:Type ContentControl}}}"
|
||||||
|
Style="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
|
</DataTemplate>
|
||||||
|
<Style x:Key="DDTContentControl" TargetType="{x:Type ContentControl}">
|
||||||
|
<Style.Triggers>
|
||||||
|
<DataTrigger Binding="{Binding Path=DataContext.DDTList, Source={x:Reference dummyElement}, Converter={StaticResource DDTListToBooleanConverter}}"
|
||||||
|
Value="True">
|
||||||
|
<Setter Property="ContentTemplate" Value="{StaticResource NoDDTTemplate}" />
|
||||||
|
</DataTrigger>
|
||||||
|
<DataTrigger Binding="{Binding Path=DataContext.DDTList, Source={x:Reference dummyElement}, Converter={StaticResource DDTListToBooleanConverter}}"
|
||||||
|
Value="False">
|
||||||
|
<Setter Property="ContentTemplate" Value="{StaticResource DDTTemplate}" />
|
||||||
|
</DataTrigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
</DataGrid.Resources>
|
||||||
|
<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>
|
<DataGrid.Columns>
|
||||||
<DataGridTextColumn Header=""
|
<DataGridTextColumn Header="ID"
|
||||||
Binding="{Binding nId}"
|
Binding="{Binding nId}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
<DataGridTextColumn Header="Line"
|
IsReadOnly="True"
|
||||||
Binding="{Binding nCSVLine}"
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
Width="Auto"/>
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="DDF"
|
<!--<DataGridTextColumn Header="DDF File Name"
|
||||||
Binding="{Binding sDDFName}"
|
Binding="{Binding sDDFName}"
|
||||||
Width="Auto"/>
|
Width="1*"
|
||||||
<!--<DataGridTextColumn Header="Quantity"
|
MinWidth="100"
|
||||||
Binding="{Binding nQuantity}"
|
IsReadOnly="True"
|
||||||
Width="Auto"/>-->
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
<DataGridTextColumn Header="State"
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>-->
|
||||||
Binding="{Binding nState}"
|
<DataGridTemplateColumn Header="DDF/DDT File Name"
|
||||||
Width="Auto"/>
|
Width="2*">
|
||||||
<DataGridTextColumn Header="Height"
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
Binding="{Binding dHeight}"
|
<DataTemplate>
|
||||||
Width="Auto"/>
|
<TextBlock Text="{Binding sDDFName}"
|
||||||
|
Style="{StaticResource DataGridTextColumn_TextBlock}"/>
|
||||||
|
</DataTemplate>
|
||||||
|
</DataGridTemplateColumn.CellTemplate>
|
||||||
|
<DataGridTemplateColumn.CellEditingTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<!--<TextBox Text="{Binding sDDFName}"
|
||||||
|
Style="{StaticResource DataGridTextColumn_TextBlock}"/>-->
|
||||||
|
<ContentControl Style="{StaticResource DDTContentControl}"/>
|
||||||
|
</DataTemplate>
|
||||||
|
</DataGridTemplateColumn.CellEditingTemplate>
|
||||||
|
</DataGridTemplateColumn>
|
||||||
<DataGridTextColumn Header="Width"
|
<DataGridTextColumn Header="Width"
|
||||||
Binding="{Binding dWidth}"
|
Binding="{Binding dWidth}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="{Binding Path=DataContext.DDTList, Source={x:Reference dummyElement}, Converter={StaticResource DDTListToBooleanConverter}}"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
|
<DataGridTextColumn Header="Height"
|
||||||
|
Binding="{Binding dHeight}"
|
||||||
|
Width="Auto"
|
||||||
|
IsReadOnly="{Binding Path=DataContext.DDTList, Source={x:Reference dummyElement}, Converter={StaticResource DDTListToBooleanConverter}}"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Thickness"
|
<DataGridTextColumn Header="Thickness"
|
||||||
Binding="{Binding dThickness}"
|
Binding="{Binding dThickness}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
<DataGridTextColumn Header="Csv"
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
|
<DataGridTextColumn Header="State"
|
||||||
|
Binding="{Binding nState}"
|
||||||
|
Width="Auto"
|
||||||
|
IsReadOnly="{Binding Path=DataContext.DDTList, Source={x:Reference dummyElement}, Converter={StaticResource DDTListToBooleanConverter}}"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
|
<DataGridTextColumn Header="CSV"
|
||||||
Binding="{Binding sCSVName}"
|
Binding="{Binding sCSVName}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}">
|
||||||
|
<DataGridTextColumn.CellStyle>
|
||||||
|
<Style TargetType="DataGridCell">
|
||||||
|
<Setter Property="ToolTip" Value="{Binding sCSVName}"/>
|
||||||
|
</Style>
|
||||||
|
</DataGridTextColumn.CellStyle>
|
||||||
|
</DataGridTextColumn>
|
||||||
|
<DataGridTextColumn Header="CSV Line"
|
||||||
|
Binding="{Binding nCSVLine}"
|
||||||
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Production State"
|
<DataGridTextColumn Header="Production State"
|
||||||
Binding="{Binding nProdState}"
|
Binding="{Binding nProdState}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Load Time"
|
<DataGridTextColumn Header="Load Time"
|
||||||
Binding="{Binding sLoadTime}"
|
Binding="{Binding sLoadTime}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Machining 1 Start"
|
<DataGridTextColumn Header="Machining 1 Start"
|
||||||
Binding="{Binding sMachining1Start}"
|
Binding="{Binding sMachining1Start}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Machining 1 End"
|
<DataGridTextColumn Header="Machining 1 End"
|
||||||
Binding="{Binding sMachining1End}"
|
Binding="{Binding sMachining1End}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Machining 2 Start"
|
<DataGridTextColumn Header="Machining 2 Start"
|
||||||
Binding="{Binding sMachining2Start}"
|
Binding="{Binding sMachining2Start}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Machining 2 End"
|
<DataGridTextColumn Header="Machining 2 End"
|
||||||
Binding="{Binding sMachining2End}"
|
Binding="{Binding sMachining2End}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
<DataGridTextColumn Header="Unload Time"
|
<DataGridTextColumn Header="Unload Time"
|
||||||
Binding="{Binding sUnloadTime}"
|
Binding="{Binding sUnloadTime}"
|
||||||
Width="Auto"/>
|
Width="Auto"
|
||||||
|
IsReadOnly="True"
|
||||||
|
ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
|
||||||
|
EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
<DataGrid.RowStyle>
|
<DataGrid.RowStyle>
|
||||||
<Style TargetType="DataGridRow">
|
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
|
||||||
<Setter Property="Background" Value="{Binding Background}"/>
|
<Setter Property="Background" Value="{Binding Background}"/>
|
||||||
|
<Setter Property="BorderBrush" Value="{Binding nState, Converter={StaticResource StateToSelColorConverter}}" />
|
||||||
</Style>
|
</Style>
|
||||||
</DataGrid.RowStyle>
|
</DataGrid.RowStyle>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
|
|||||||
@@ -51,14 +51,33 @@
|
|||||||
<Reference Include="Effector.Plugin.Interface">
|
<Reference Include="Effector.Plugin.Interface">
|
||||||
<HintPath>..\..\Effector.Main\Effector.Plugin.Interface\bin\Debug\Effector.Plugin.Interface.dll</HintPath>
|
<HintPath>..\..\Effector.Main\Effector.Plugin.Interface\bin\Debug\Effector.Plugin.Interface.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="Google.Apis, Version=1.68.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Google.Apis.1.68.0\lib\net462\Google.Apis.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Google.Apis.Auth, Version=1.68.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Google.Apis.Auth.1.68.0\lib\net462\Google.Apis.Auth.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Google.Apis.Core, Version=1.68.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Google.Apis.Core.1.68.0\lib\net462\Google.Apis.Core.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Google.Apis.Sheets.v4, Version=1.68.0.3624, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Google.Apis.Sheets.v4.1.68.0.3624\lib\net462\Google.Apis.Sheets.v4.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Effector.Plugin.Lib">
|
||||||
|
<HintPath>..\..\Effector.Plugin.Lib\Effector.Plugin.Lib\bin\Debug\Effector.Plugin.Lib.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="KeraLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
|
<Reference Include="KeraLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\KeraLua.1.4.1\lib\net46\KeraLua.dll</HintPath>
|
<HintPath>..\packages\KeraLua.1.4.1\lib\net46\KeraLua.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="System.CodeDom, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.CodeDom.7.0.0\lib\net462\System.CodeDom.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.ComponentModel.Composition" />
|
<Reference Include="System.ComponentModel.Composition" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Management" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
@@ -98,9 +117,6 @@
|
|||||||
<DependentUpon>DoorListPageV.xaml</DependentUpon>
|
<DependentUpon>DoorListPageV.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="DoorListPage\DoorListPageVM.vb" />
|
<Compile Include="DoorListPage\DoorListPageVM.vb" />
|
||||||
<Compile Include="ProcessManager\ProcessManagerV.xaml.vb">
|
|
||||||
<DependentUpon>ProcessManagerV.xaml</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="FiveLakesUI.xaml.vb">
|
<Compile Include="FiveLakesUI.xaml.vb">
|
||||||
<DependentUpon>FiveLakesUI.xaml</DependentUpon>
|
<DependentUpon>FiveLakesUI.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -116,7 +132,6 @@
|
|||||||
<DependentUpon>MainMenuV.xaml</DependentUpon>
|
<DependentUpon>MainMenuV.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="MainMenu\MainMenuVM.vb" />
|
<Compile Include="MainMenu\MainMenuVM.vb" />
|
||||||
<Compile Include="ProcessManager\ProcessManagerVM.vb" />
|
|
||||||
<Compile Include="RestartWnd\RestartWndV.xaml.vb">
|
<Compile Include="RestartWnd\RestartWndV.xaml.vb">
|
||||||
<DependentUpon>RestartWndV.xaml</DependentUpon>
|
<DependentUpon>RestartWndV.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -142,7 +157,6 @@
|
|||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Utility\Command.vb" />
|
<Compile Include="Utility\Command.vb" />
|
||||||
<Compile Include="Utility\ExecProcessManager.vb" />
|
|
||||||
<Compile Include="Utility\GenInterface.vb" />
|
<Compile Include="Utility\GenInterface.vb" />
|
||||||
<Compile Include="Utility\IdNameStruct.vb" />
|
<Compile Include="Utility\IdNameStruct.vb" />
|
||||||
<Compile Include="Utility\IniFile.vb" />
|
<Compile Include="Utility\IniFile.vb" />
|
||||||
@@ -160,16 +174,14 @@
|
|||||||
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
||||||
</None>
|
</None>
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
|
<Resource Include="Resources\Fonts\Roboto-Light.ttf" />
|
||||||
|
<Resource Include="Resources\Fonts\Roboto-Regular.ttf" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Page Include="DoorListPage\DoorListPageV.xaml">
|
<Page Include="DoorListPage\DoorListPageV.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="ProcessManager\ProcessManagerV.xaml">
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
<Generator>MSBuild:Compile</Generator>
|
|
||||||
</Page>
|
|
||||||
<Page Include="FiveLakesUI.xaml">
|
<Page Include="FiveLakesUI.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
@@ -195,6 +207,27 @@
|
|||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Resource Include="Resources\DoorListPage\Add.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\Copy.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\MultipleCopy.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\OpenCsv.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\Produce.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\ProduceAll.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\ResetProduction.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\SaveCsv.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\SkipDoor.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\Verify.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Resource Include="Resources\DoorListPage\Delete.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\DeleteCsv.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\MoveDown.png" />
|
||||||
|
<Resource Include="Resources\DoorListPage\MoveUp.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Resource Include="Resources\DoorListPage\NotProduce.png" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PreBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\pre-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)</PreBuildEvent>
|
<PreBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\pre-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)</PreBuildEvent>
|
||||||
|
|||||||
@@ -3,12 +3,8 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
|
xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
|
||||||
DataContext="{StaticResource FiveLakesUIVM}">
|
DataContext="{StaticResource FiveLakesUIVM}">
|
||||||
<TabControl SelectedIndex="{Binding SelPage}">
|
<TabControl SelectedIndex="{Binding SelPage}"
|
||||||
<TabControl.ItemContainerStyle>
|
Style="{StaticResource NoHeader_TabControl}">
|
||||||
<Style TargetType="TabItem">
|
|
||||||
<Setter Property="Visibility" Value="Collapsed" />
|
|
||||||
</Style>
|
|
||||||
</TabControl.ItemContainerStyle>
|
|
||||||
<TabItem Name="DoorList"
|
<TabItem Name="DoorList"
|
||||||
Header="DoorList">
|
Header="DoorList">
|
||||||
<local:DoorListPageV DataContext="{StaticResource DoorListVM}"/>
|
<local:DoorListPageV DataContext="{StaticResource DoorListVM}"/>
|
||||||
@@ -22,11 +18,4 @@
|
|||||||
<local:StatisticsPageV DataContext="{StaticResource StatisticsPageVM}"/>
|
<local:StatisticsPageV DataContext="{StaticResource StatisticsPageVM}"/>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
<!--<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="1*"/>
|
|
||||||
<ColumnDefinition Width="1*"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock Text="{Binding TextTest}" Background="Green"/>
|
|
||||||
<Button Grid.Column="1"
|
|
||||||
x:Name="Button1"/>-->
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ Public Class FiveLakesUIVM
|
|||||||
m_sConfigDir = m_sDataRoot & "\" & CONF_DIR
|
m_sConfigDir = m_sDataRoot & "\" & CONF_DIR
|
||||||
' Impostazione path Ini file
|
' Impostazione path Ini file
|
||||||
IniFile.SetIniFile(m_sConfigDir & "\" & INI_FILE_NAME)
|
IniFile.SetIniFile(m_sConfigDir & "\" & INI_FILE_NAME)
|
||||||
|
Effector.Plugin.Lib.PluginIniFile.SetIniFile(m_sConfigDir & "\" & INI_FILE_NAME)
|
||||||
' Impostazione path resources dir
|
' Impostazione path resources dir
|
||||||
m_sResourcesRoot = m_sDataRoot & "\" & RES_DIR
|
m_sResourcesRoot = m_sDataRoot & "\" & RES_DIR
|
||||||
End Sub
|
End Sub
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
<local:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
|
<local:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
|
||||||
<local:StringToMachineStateConverter x:Key="StringToMachineStateConverter"/>
|
<local:StringToMachineStateConverter x:Key="StringToMachineStateConverter"/>
|
||||||
<local:StringToDDFCalcStateConverter x:Key="StringToDDFCalcStateConverter"/>
|
<local:StringToDDFCalcStateConverter x:Key="StringToDDFCalcStateConverter"/>
|
||||||
|
<local:DDFCalcStateToVisibilityConverter x:Key="DDFCalcStateToVisibilityConverter"/>
|
||||||
<local:StringToNewDoorStateConverter x:Key="StringToNewDoorStateConverter"/>
|
<local:StringToNewDoorStateConverter x:Key="StringToNewDoorStateConverter"/>
|
||||||
<local:StringToBooleanConverter x:Key="StringToBooleanConverter"/>
|
<local:StringToBooleanConverter x:Key="StringToBooleanConverter"/>
|
||||||
<local:StringToBackgroundConverter x:Key="StringToBackgroundConverter"/>
|
<local:StringToBackgroundConverter x:Key="StringToBackgroundConverter"/>
|
||||||
@@ -43,7 +44,8 @@
|
|||||||
</ItemsControl.ItemTemplate>
|
</ItemsControl.ItemTemplate>
|
||||||
</ItemsControl>
|
</ItemsControl>
|
||||||
<Grid Grid.Column="1"
|
<Grid Grid.Column="1"
|
||||||
VerticalAlignment="Center">
|
VerticalAlignment="Center"
|
||||||
|
Visibility="{Binding MachineCommands_Visibility}">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
@@ -773,6 +775,17 @@
|
|||||||
<TextBlock Text="{Binding DoorOnMachineArray[0].nId}"
|
<TextBlock Text="{Binding DoorOnMachineArray[0].nId}"
|
||||||
Style="{StaticResource MachDrawVar_TextBlock}"/>
|
Style="{StaticResource MachDrawVar_TextBlock}"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
<Grid Grid.Column="1">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="1*"/>
|
||||||
|
<RowDefinition Height="1*"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<ProgressBar Grid.Row="1"
|
||||||
|
Value="{Binding dDdfCalcValue, Mode=OneWay}"
|
||||||
|
Height="20"
|
||||||
|
Maximum="100"
|
||||||
|
Visibility="{Binding nDDfCalcState, Converter={StaticResource DDFCalcStateToVisibilityConverter}}"/>
|
||||||
|
</Grid>
|
||||||
<Border Grid.Column="3"
|
<Border Grid.Column="3"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Visibility="{Binding VariableList[1].sValue, Converter={StaticResource StringToVisibilityConverter}}"
|
Visibility="{Binding VariableList[1].sValue, Converter={StaticResource StringToVisibilityConverter}}"
|
||||||
|
|||||||
@@ -44,6 +44,13 @@ Public Class MachinePageVM
|
|||||||
NotifyPropertyChanged(NameOf(nDDfCalcState))
|
NotifyPropertyChanged(NameOf(nDDfCalcState))
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private m_dDdfCalcValue As Double = 0
|
||||||
|
Public ReadOnly Property dDdfCalcValue As Double
|
||||||
|
Get
|
||||||
|
Return m_dDdfCalcValue
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
Private m_nNewDoorState As Integer = -1
|
Private m_nNewDoorState As Integer = -1
|
||||||
Public ReadOnly Property nNewDoorState As Integer
|
Public ReadOnly Property nNewDoorState As Integer
|
||||||
Get
|
Get
|
||||||
@@ -159,7 +166,7 @@ Public Class MachinePageVM
|
|||||||
AddHandler m_VarTimer.Tick, AddressOf VarTimer_Tick
|
AddHandler m_VarTimer.Tick, AddressOf VarTimer_Tick
|
||||||
m_VarTimer.Interval = New TimeSpan(100)
|
m_VarTimer.Interval = New TimeSpan(100)
|
||||||
m_VarTimer.Start()
|
m_VarTimer.Start()
|
||||||
m_DoorOnMachineList.Add(New Door(35, 1, "Test.ddf", "Produzione2024", 1, 800, 1800, 40, {""}, {""}))
|
' m_DoorOnMachineList.Add(New Door(35, 1, "Test.ddf", "Produzione2024", 1, 800, 1800, 40, {""}, {""}))
|
||||||
Dim sResourcesDirPath As String = ""
|
Dim sResourcesDirPath As String = ""
|
||||||
GetPluginPrivateProfileString(S_GENERAL, K_RESOURCESDIR, "", sResourcesDirPath)
|
GetPluginPrivateProfileString(S_GENERAL, K_RESOURCESDIR, "", sResourcesDirPath)
|
||||||
m_sMachineImagePath = sResourcesDirPath & "\FiveLakesMachine.png"
|
m_sMachineImagePath = sResourcesDirPath & "\FiveLakesMachine.png"
|
||||||
@@ -242,6 +249,14 @@ Public Class MachinePageVM
|
|||||||
Dim nState As Integer = -1
|
Dim nState As Integer = -1
|
||||||
If LuaGetGlobVar("MACHINE1.DDfCalcState", nState) Then
|
If LuaGetGlobVar("MACHINE1.DDfCalcState", nState) Then
|
||||||
SetDDfCalcState(nState)
|
SetDDfCalcState(nState)
|
||||||
|
If nState = 1 Then
|
||||||
|
m_dDdfCalcValue += 100 / 250
|
||||||
|
m_dDdfCalcValue = Math.Min(100, m_dDdfCalcValue)
|
||||||
|
ElseIf m_dDdfCalcValue <> 0 Then
|
||||||
|
m_dDdfCalcValue = 0
|
||||||
|
End If
|
||||||
|
NotifyPropertyChanged(NameOf(dDdfCalcValue))
|
||||||
|
NotifyPropertyChanged(NameOf(nDDfCalcState))
|
||||||
End If
|
End If
|
||||||
If LuaGetGlobVar("MACHINE1.NewDoorState", nState) Then
|
If LuaGetGlobVar("MACHINE1.NewDoorState", nState) Then
|
||||||
SetNewDoorState(nState)
|
SetNewDoorState(nState)
|
||||||
@@ -962,6 +977,20 @@ Public Class StringToDDFCalcStateConverter
|
|||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
|
Public Class DDFCalcStateToVisibilityConverter
|
||||||
|
Implements IValueConverter
|
||||||
|
|
||||||
|
Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
|
||||||
|
If TypeOf value IsNot Integer Then Return Visibility.Collapsed
|
||||||
|
Return If(value = 0, Visibility.Collapsed, Visibility.Visible)
|
||||||
|
End Function
|
||||||
|
|
||||||
|
Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
|
||||||
|
Throw New NotImplementedException()
|
||||||
|
End Function
|
||||||
|
|
||||||
|
End Class
|
||||||
|
|
||||||
Public Class StringToNewDoorStateConverter
|
Public Class StringToNewDoorStateConverter
|
||||||
Implements IValueConverter
|
Implements IValueConverter
|
||||||
|
|
||||||
|
|||||||
@@ -14,19 +14,19 @@
|
|||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<RadioButton Content="Door List"
|
<RadioButton Content="DOOR LIST"
|
||||||
Command="{Binding Page_Command}"
|
Command="{Binding Page_Command}"
|
||||||
CommandParameter="{StaticResource Door_List}"
|
CommandParameter="{StaticResource Door_List}"
|
||||||
IsChecked="True"
|
IsChecked="True"
|
||||||
Style="{StaticResource {x:Type ToggleButton}}"/>
|
Style="{StaticResource MainMenu_ToggleButton}"/>
|
||||||
<RadioButton Grid.Column="1"
|
<RadioButton Grid.Column="1"
|
||||||
Content="Machine Status"
|
Content="MACHINE STATUS"
|
||||||
Command="{Binding Page_Command}"
|
Command="{Binding Page_Command}"
|
||||||
CommandParameter="{StaticResource Machine_State}"
|
CommandParameter="{StaticResource Machine_State}"
|
||||||
Style="{StaticResource {x:Type ToggleButton}}"/>
|
Style="{StaticResource MainMenu_ToggleButton}"/>
|
||||||
<RadioButton Grid.Column="2"
|
<!--<RadioButton Grid.Column="2"
|
||||||
Content="Statistics"
|
Content="Statistics"
|
||||||
Command="{Binding Page_Command}"
|
Command="{Binding Page_Command}"
|
||||||
CommandParameter="{StaticResource Statistics}"
|
CommandParameter="{StaticResource Statistics}"
|
||||||
Style="{StaticResource {x:Type ToggleButton}}"/>
|
Style="{StaticResource MainMenu_ToggleButton}"/>-->
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -1,57 +1,67 @@
|
|||||||
<Window x:Class="ProcessManagerV"
|
<Lib:EgtWindow x:Class="ProcessManagerV"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Height="200"
|
xmlns:Lib="clr-namespace:Effector.Plugin.Lib;assembly=Effector.Plugin.Lib"
|
||||||
Width="300">
|
TitleBarHeight="30"
|
||||||
<StackPanel>
|
WindowStartupLocation="CenterOwner"
|
||||||
<Grid HorizontalAlignment="Center">
|
ShowInTaskbar="False"
|
||||||
<Grid.ColumnDefinitions>
|
SizeToContent="WidthAndHeight">
|
||||||
<ColumnDefinition Width="Auto"/>
|
<Grid>
|
||||||
<ColumnDefinition Width="30"/>
|
<Grid.RowDefinitions>
|
||||||
</Grid.ColumnDefinitions>
|
<RowDefinition Height="{Binding TitleBarHeight, RelativeSource={RelativeSource AncestorType={x:Type Lib:EgtWindow}}}"/>
|
||||||
<Grid.RowDefinitions>
|
<RowDefinition Height="1*"/>
|
||||||
<RowDefinition Height="Auto"/>
|
</Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<Lib:TitleBar/>
|
||||||
</Grid.RowDefinitions>
|
<StackPanel Grid.Row="1">
|
||||||
<TextBlock Text="Arguments Queue Count: "/>
|
<Grid HorizontalAlignment="Center">
|
||||||
<TextBlock Grid.Column="1"
|
<Grid.ColumnDefinitions>
|
||||||
Text="{Binding ArgumentsQueue}"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<TextBlock Grid.Row="1"
|
<ColumnDefinition Width="30"/>
|
||||||
Text="ResultQueue: "/>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock Grid.Column="1"
|
<Grid.RowDefinitions>
|
||||||
Grid.Row="1"
|
<RowDefinition Height="Auto"/>
|
||||||
Text="{Binding ResultQueue}"/>
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid>
|
</Grid.RowDefinitions>
|
||||||
<!--<DataGrid ItemsSource="{Binding ThreadList}"
|
<TextBlock Text="Arguments Queue Count: "/>
|
||||||
AutoGenerateColumns="False">
|
<TextBlock Grid.Column="1"
|
||||||
<DataGrid.Columns>
|
Text="{Binding ArgumentsQueue}"/>
|
||||||
<DataGridTextColumn Header="Process Status"
|
<TextBlock Grid.Row="1"
|
||||||
Binding="{Binding ProcessStatus}"/>
|
Text="ResultQueue: "/>
|
||||||
<DataGridTextColumn Header="Curr Request Id"
|
<TextBlock Grid.Column="1"
|
||||||
Binding="{Binding CurrRequest.nId}"/>
|
Grid.Row="1"
|
||||||
<DataGridTextColumn Header="Curr Request Args"
|
Text="{Binding ResultQueue}"/>
|
||||||
Binding="{Binding CurrRequest.sArgs}"/>
|
</Grid>
|
||||||
<DataGridTextColumn Header="Process Result"
|
<!--<DataGrid ItemsSource="{Binding ThreadList}"
|
||||||
Binding="{Binding nProcResult}"/>
|
AutoGenerateColumns="False">
|
||||||
</DataGrid.Columns>
|
<DataGrid.Columns>
|
||||||
</DataGrid>-->
|
<DataGridTextColumn Header="Process Status"
|
||||||
<ItemsControl ItemsSource="{Binding ThreadList}">
|
Binding="{Binding ProcessStatus}"/>
|
||||||
<ItemsControl.ItemTemplate>
|
<DataGridTextColumn Header="Curr Request Id"
|
||||||
<DataTemplate>
|
Binding="{Binding CurrRequest.nId}"/>
|
||||||
<StackPanel Orientation="Horizontal">
|
<DataGridTextColumn Header="Curr Request Args"
|
||||||
<TextBlock Text="{Binding ProcessStatus}"/>
|
Binding="{Binding CurrRequest.sArgs}"/>
|
||||||
<TextBlock Text="{Binding CurrRequest.nId}"/>
|
<DataGridTextColumn Header="Process Result"
|
||||||
<TextBlock Text="{Binding CurrRequest.sArgs}"/>
|
Binding="{Binding nProcResult}"/>
|
||||||
<TextBlock Text="{Binding nProcResult}"/>
|
</DataGrid.Columns>
|
||||||
</StackPanel>
|
</DataGrid>-->
|
||||||
</DataTemplate>
|
<ItemsControl ItemsSource="{Binding ThreadList}">
|
||||||
</ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
</ItemsControl>
|
<DataTemplate>
|
||||||
<ProgressBar Value="{Binding dProgress_Value, Mode=OneWay}"
|
<StackPanel Orientation="Horizontal">
|
||||||
Minimum="0"
|
<TextBlock Text="{Binding ProcessStatus}"/>
|
||||||
Maximum="{Binding dProgress_Maximum}"
|
<TextBlock Text="{Binding CurrRequest.nId}"/>
|
||||||
Height="20"
|
<TextBlock Text="{Binding CurrRequest.sArgs}"/>
|
||||||
Width="250"/>
|
<TextBlock Text="{Binding nProcResult}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
</ItemsControl.ItemTemplate>
|
||||||
|
</ItemsControl>
|
||||||
|
<ProgressBar Value="{Binding dProgress_Value, Mode=OneWay}"
|
||||||
|
Minimum="0"
|
||||||
|
Maximum="{Binding dProgress_Maximum}"
|
||||||
|
Height="20"
|
||||||
|
Width="250"/>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Window>
|
</Grid>
|
||||||
|
</Lib:EgtWindow>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
Imports System.Windows.Threading
|
Imports System.Windows.Threading
|
||||||
Imports System.Collections.ObjectModel
|
Imports System.Collections.ObjectModel
|
||||||
|
Imports Effector.Plugin.Lib
|
||||||
|
|
||||||
Public Class ProcessManagerVM
|
Public Class ProcessManagerVM
|
||||||
Inherits VMBase
|
Inherits VMBase
|
||||||
|
|||||||
|
After Width: | Height: | Size: 542 B |
|
After Width: | Height: | Size: 484 B |
|
After Width: | Height: | Size: 608 B |
|
After Width: | Height: | Size: 773 B |
|
After Width: | Height: | Size: 358 B |
|
After Width: | Height: | Size: 328 B |
|
After Width: | Height: | Size: 547 B |
|
After Width: | Height: | Size: 730 B |
|
After Width: | Height: | Size: 626 B |
|
After Width: | Height: | Size: 452 B |
|
After Width: | Height: | Size: 767 B |
|
After Width: | Height: | Size: 390 B |
|
After Width: | Height: | Size: 175 B |
|
After Width: | Height: | Size: 685 B |
|
After Width: | Height: | Size: 237 B |
|
After Width: | Height: | Size: 668 B |
@@ -16,43 +16,88 @@
|
|||||||
<local:StatisticsPageVM x:Key="StatisticsPageVM"/>
|
<local:StatisticsPageVM x:Key="StatisticsPageVM"/>
|
||||||
|
|
||||||
<!--Colori predefiniti-->
|
<!--Colori predefiniti-->
|
||||||
<SolidColorBrush x:Key="EgaltechBlue1" Color="#FF4D84C4" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechBlue2" Color="#FF7096CE" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechBlue3" Color="#FF90ABD9" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechBlue4" Color="#FFB2C3E4" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechGray" Color="#FF585858" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechUltralightGray" Color="#FFF2F2F2" />
|
|
||||||
<SolidColorBrush x:Key="EgaltechGreen" Color="#FF00FF00" />
|
|
||||||
|
|
||||||
<SolidColorBrush x:Key="Roller" Color="#FF585858" />
|
<!--#e8eef5-->
|
||||||
<SolidColorBrush x:Key="TableFrame" Color="LightGray" />
|
<Color x:Key="Effector_LightBlue_Color" R="232" G="238" B="245" A="255"/>
|
||||||
<SolidColorBrush x:Key="Structure" Color="#61b0ff" />
|
<SolidColorBrush x:Key="Effector_LightBlue" Color="{StaticResource Effector_LightBlue_Color}" />
|
||||||
<SolidColorBrush x:Key="Bridge" Color="LightBlue" />
|
<!--#afc5d6-->
|
||||||
<SolidColorBrush x:Key="Shuttle" Color="DarkGray" />
|
<Color x:Key="Effector_Blue_Color" R="175" G="197" B="214" A="255"/>
|
||||||
|
<SolidColorBrush x:Key="Effector_Blue" Color="{StaticResource Effector_Blue_Color}" />
|
||||||
<!--#92908d-->
|
<!--#749fc4-->
|
||||||
<Color x:Key="Icarus_Gray_Color" R="146" G="144" B="141" A="255"/>
|
<Color x:Key="Effector_DarkBlue_Color" R="116" G="159" B="196" A="255"/>
|
||||||
<SolidColorBrush x:Key="Icarus_Gray" Color="{StaticResource Icarus_Gray_Color}" />
|
<SolidColorBrush x:Key="Effector_DarkBlue" Color="{StaticResource Effector_DarkBlue_Color}" />
|
||||||
<!--#3c89c9-->
|
|
||||||
<Color x:Key="Icarus_LightBlue_Color" R="60" G="137" B="201" A="255"/>
|
|
||||||
<SolidColorBrush x:Key="Icarus_LightBlue" Color="{StaticResource Icarus_LightBlue_Color}" />
|
<!--#92bde3-->
|
||||||
<!--#2e5a81-->
|
<Color x:Key="Effector_LightBlue_Status_Color" R="146" G="189" B="227" A="255"/>
|
||||||
<Color x:Key="Icarus_Blue_Color" R="46" G="90" B="129" A="255"/>
|
<SolidColorBrush x:Key="Effector_LightBlue_Status" Color="{StaticResource Effector_LightBlue_Status_Color}" />
|
||||||
<SolidColorBrush x:Key="Icarus_Blue" Color="{StaticResource Icarus_Blue_Color}" />
|
<!--#5682a6-->
|
||||||
<!--#50A388-->
|
<Color x:Key="Effector_Blue_Status_Color" R="86" G="130" B="166" A="255"/>
|
||||||
<Color x:Key="Icarus_Green_Color" R="80" G="163" B="136" A="255"/>
|
<SolidColorBrush x:Key="Effector_Blue_Status" Color="{StaticResource Effector_Blue_Status_Color}" />
|
||||||
<SolidColorBrush x:Key="Icarus_Green" Color="{StaticResource Icarus_Green_Color}" />
|
<!--#cd5c5c-->
|
||||||
|
<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_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_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_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-->
|
<!--#BC373E-->
|
||||||
<Color x:Key="Icarus_Orange_Color" R="188" G="55" B="62" A="255"/>
|
<!--
|
||||||
<SolidColorBrush x:Key="Icarus_Orange" Color="{StaticResource Icarus_Orange_Color}" />
|
<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-->
|
<!--#A74C77-->
|
||||||
<Color x:Key="Icarus_Purple_Color" R="167" G="76" B="119" A="255"/>
|
<!--
|
||||||
<SolidColorBrush x:Key="Icarus_Purple" Color="{StaticResource Icarus_Purple_Color}" />
|
<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-->
|
<!--Colori default dei controlli-->
|
||||||
<SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
|
<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 -->
|
<!--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-->
|
<!--o viene eseguito un lua che non aggiorna l'interfaccia-->
|
||||||
@@ -65,6 +110,181 @@
|
|||||||
<Thickness x:Key="WindowBorder_Thickness">2</Thickness>
|
<Thickness x:Key="WindowBorder_Thickness">2</Thickness>
|
||||||
<sys:Double x:Key="WindowBorder_Height">2</sys:Double>
|
<sys:Double x:Key="WindowBorder_Height">2</sys:Double>
|
||||||
|
|
||||||
|
<!--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}" BasedOn="{StaticResource {x:Type Button}}">
|
||||||
|
<Setter Property="Height" Value="40"/>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
<Setter Property="Padding" Value="2"/>
|
||||||
|
</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>
|
||||||
|
|
||||||
|
<!--Border-->
|
||||||
|
|
||||||
|
<Style x:Key="Parameter_MachinePage_Border" TargetType="{x:Type GroupBox}">
|
||||||
|
<Setter Property="BorderThickness" Value="1"/>
|
||||||
|
<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"/>
|
||||||
|
<Setter Property="ItemContainerStyle">
|
||||||
|
<Setter.Value>
|
||||||
|
<Style TargetType="{x:Type ComboBoxItem}">
|
||||||
|
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||||
|
</Style>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<!--Style for page tabcontrol-->
|
||||||
|
|
||||||
|
<ControlTemplate x:Key="NoHeader_TabControl_ControlTemplate" TargetType="{x:Type TabControl}">
|
||||||
|
<Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
|
||||||
|
<Border x:Name="contentPanel" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
|
||||||
|
<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
<ControlTemplate.Triggers>
|
||||||
|
<Trigger Property="IsEnabled" Value="false">
|
||||||
|
<Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
|
||||||
|
</Trigger>
|
||||||
|
</ControlTemplate.Triggers>
|
||||||
|
</ControlTemplate>
|
||||||
|
<Style x:Key="NoHeader_TabControl" TargetType="{x:Type TabControl}">
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
<Setter Property="Padding" Value="0"/>
|
||||||
|
<Setter Property="Template" Value="{StaticResource NoHeader_TabControl_ControlTemplate}"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<!-- Image -->
|
||||||
|
|
||||||
|
<Style x:Key="Button_Image" TargetType="{x:Type Image}">
|
||||||
|
<Setter Property="Stretch" Value="Uniform" />
|
||||||
|
</Style>
|
||||||
|
|
||||||
<!--Stili per disegno macchina con porte-->
|
<!--Stili per disegno macchina con porte-->
|
||||||
|
|
||||||
<Style x:Key="Table" TargetType="Border">
|
<Style x:Key="Table" TargetType="Border">
|
||||||
@@ -98,13 +318,5 @@
|
|||||||
<Setter Property="Focusable" Value="False"/>
|
<Setter Property="Focusable" Value="False"/>
|
||||||
<Setter Property="BorderThickness" Value="0"/>
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<!--Border-->
|
|
||||||
|
|
||||||
<Style x:Key="Parameter_MachinePage_Border" TargetType="{x:Type GroupBox}">
|
|
||||||
<Setter Property="BorderThickness" Value="1"/>
|
|
||||||
<Setter Property="BorderBrush" Value="DarkGray"/>
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -12,77 +12,125 @@ Public Class Dictionary
|
|||||||
|
|
||||||
#Region "Colors"
|
#Region "Colors"
|
||||||
|
|
||||||
'Private m_Omag_Red As SolidColorBrush = Brushes.Red
|
Private Shared m_Effector_LightBlue As SolidColorBrush = Application.Current.FindResource("Effector_LightBlue")
|
||||||
'Public ReadOnly Property Omag_Red As SolidColorBrush
|
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
|
' Get
|
||||||
' Return m_Omag_Red
|
' Return m_Effector_Orange
|
||||||
' End Get
|
' End Get
|
||||||
'End Property
|
'End Property
|
||||||
|
|
||||||
'Private Shared m_Button_Static_Background As SolidColorBrush = New BrushConverter().ConvertFrom("#FFDDDDDD")
|
|
||||||
'Public Shared ReadOnly Property Button_Static_Background As SolidColorBrush
|
|
||||||
' Get
|
|
||||||
' Return m_Button_Static_Background
|
|
||||||
' End Get
|
|
||||||
'End Property
|
|
||||||
|
|
||||||
'Private Shared m_TabControl_Header_Background As LinearGradientBrush = Application.Current.FindResource("TabItem.Static.Background")
|
|
||||||
'Public Shared ReadOnly Property TabControl_Header_Background As LinearGradientBrush
|
|
||||||
' Get
|
|
||||||
' Return m_TabControl_Header_Background
|
|
||||||
' End Get
|
|
||||||
'End Property
|
|
||||||
|
|
||||||
|
|
||||||
'Private Shared m_Icarus_Gray As SolidColorBrush = Application.Current.FindResource("Icarus_Gray")
|
|
||||||
'Public Shared ReadOnly Property Icarus_Gray As SolidColorBrush
|
|
||||||
' Get
|
|
||||||
' Return m_Icarus_Gray
|
|
||||||
' End Get
|
|
||||||
'End Property
|
|
||||||
|
|
||||||
'Private Shared m_Icarus_LightBlue As SolidColorBrush = Application.Current.FindResource("Icarus_LightBlue")
|
|
||||||
'Public Shared ReadOnly Property Icarus_LightBlue As SolidColorBrush
|
|
||||||
' Get
|
|
||||||
' Return m_Icarus_LightBlue
|
|
||||||
' End Get
|
|
||||||
'End Property
|
|
||||||
|
|
||||||
'Private Shared m_Icarus_Blue As SolidColorBrush = Application.Current.FindResource("Icarus_Blue")
|
|
||||||
'Public Shared ReadOnly Property Icarus_Blue As SolidColorBrush
|
|
||||||
' Get
|
|
||||||
' Return m_Icarus_Blue
|
|
||||||
' End Get
|
|
||||||
'End Property
|
|
||||||
|
|
||||||
'Private Shared m_Icarus_Green As SolidColorBrush = Application.Current.FindResource("Icarus_Green")
|
|
||||||
'Public Shared ReadOnly Property Icarus_Green As SolidColorBrush
|
|
||||||
' Get
|
|
||||||
' Return m_Icarus_Green
|
|
||||||
' 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
|
|
||||||
' Get
|
|
||||||
' Return m_Icarus_Purple
|
|
||||||
' End Get
|
|
||||||
'End Property
|
|
||||||
|
|
||||||
'<SolidColorBrush x : Key="Icarus_Gray" Color="#92908d" />
|
|
||||||
'<SolidColorBrush x : Key="Icarus_LightBlue" Color="#3c89c9" />
|
|
||||||
'<SolidColorBrush x : Key="Icarus_Blue" Color="#2e5a81" />
|
|
||||||
'<SolidColorBrush x : Key="Icarus_Green" Color="#40826d" />
|
|
||||||
'<SolidColorBrush x : Key="Icarus_Orange" Color="#C37636" />
|
|
||||||
'<SolidColorBrush x : Key="Icarus_Purple" Color="#990066" />
|
|
||||||
|
|
||||||
#End Region ' Colors
|
#End Region ' Colors
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ Imports System.Threading
|
|||||||
Imports MS.Internal
|
Imports MS.Internal
|
||||||
Imports Effector.Plugin.FiveLakes.ThreadData
|
Imports Effector.Plugin.FiveLakes.ThreadData
|
||||||
Imports System.Windows.Threading
|
Imports System.Windows.Threading
|
||||||
|
Imports Effector.Plugin.Lib
|
||||||
|
|
||||||
Public Class ExecProcessManager
|
Public Class ExecProcessManager
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,13 @@ Public Class JsonDoor
|
|||||||
End Get
|
End Get
|
||||||
End Property
|
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
|
Private m_sCSVName As String
|
||||||
Public ReadOnly Property sCSVName As String
|
Public ReadOnly Property sCSVName As String
|
||||||
Get
|
Get
|
||||||
@@ -140,7 +147,7 @@ Public Class JsonDoor
|
|||||||
#End Region ' Statistics
|
#End Region ' Statistics
|
||||||
|
|
||||||
<JsonConstructor>
|
<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)
|
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_nListIndex = nListIndex
|
||||||
m_nId = nId
|
m_nId = nId
|
||||||
@@ -151,6 +158,7 @@ Public Class JsonDoor
|
|||||||
m_dHeight = dHeight
|
m_dHeight = dHeight
|
||||||
m_dWidth = dWidth
|
m_dWidth = dWidth
|
||||||
m_dThickness = dThickness
|
m_dThickness = dThickness
|
||||||
|
m_nSwing = nSwing
|
||||||
m_nState = nState
|
m_nState = nState
|
||||||
m_CustomerParameters = CustomerParameters
|
m_CustomerParameters = CustomerParameters
|
||||||
m_nProdState = nProdState
|
m_nProdState = nProdState
|
||||||
@@ -172,6 +180,7 @@ Public Class JsonDoor
|
|||||||
m_dHeight = Door.dHeight
|
m_dHeight = Door.dHeight
|
||||||
m_dWidth = Door.dWidth
|
m_dWidth = Door.dWidth
|
||||||
m_dThickness = Door.dThickness
|
m_dThickness = Door.dThickness
|
||||||
|
m_nSwing = Door.nSwing
|
||||||
m_nState = Door.nState
|
m_nState = Door.nState
|
||||||
m_CustomerParameters = Door.CustomerParameters
|
m_CustomerParameters = Door.CustomerParameters
|
||||||
m_nProdState = Door.nProdState
|
m_nProdState = Door.nProdState
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
|
<package id="Google.Apis" version="1.68.0" targetFramework="net472" />
|
||||||
|
<package id="Google.Apis.Auth" version="1.68.0" targetFramework="net472" />
|
||||||
|
<package id="Google.Apis.Core" version="1.68.0" targetFramework="net472" />
|
||||||
|
<package id="Google.Apis.Sheets.v4" version="1.68.0.3624" targetFramework="net472" />
|
||||||
<package id="KeraLua" version="1.4.1" targetFramework="net472" />
|
<package id="KeraLua" version="1.4.1" targetFramework="net472" />
|
||||||
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
|
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
|
||||||
|
<package id="System.CodeDom" version="7.0.0" targetFramework="net472" />
|
||||||
|
<package id="System.Management" version="7.0.2" targetFramework="net472" />
|
||||||
</packages>
|
</packages>
|
||||||