Gestione Assembly/Door in OptionPage

This commit is contained in:
NicolaP
2021-05-05 18:24:53 +02:00
parent 82b04429d9
commit 19d2efae73
5 changed files with 60 additions and 8 deletions
+1 -1
View File
@@ -446,9 +446,9 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<AppDesigner Include="My Project\" />
<Resource Include="Resources\InstrumentPanel\LinearDimension.png" />
<Resource Include="Resources\TopCommandBar\DeleteDir.png" />
<Resource Include="Resources\EgtCAM5.png" />
<Resource Include="Resources\InstrumentPanel\LinearDimension.png" />
<Content Include="Resources\TopCommandBar\SaveAsTemplate1.png" />
</ItemGroup>
<ItemGroup>
+2 -2
View File
@@ -72,5 +72,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.4.1")>
<Assembly: AssemblyFileVersion("2.3.4.1")>
<Assembly: AssemblyVersion("2.3.5.1")>
<Assembly: AssemblyFileVersion("2.3.5.1")>
+23
View File
@@ -179,6 +179,29 @@
TextWrapping="Wrap" TextAlignment="Center" Margin="5,0,5,0"/>
</Grid>
</GroupBox>
<!--Funzionamento a progetto-->
<GroupBox Header="{Binding ProjectMsg}" Grid.Row="1" Grid.Column="3" Margin="5,0,0,0"
Visibility="{Binding VisibilityConfiguration}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="5*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="3*"/>
</Grid.RowDefinitions>
<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource DoorParamsChBx}"
IsChecked="{Binding EnableAssembly}"/>
<TextBlock Text="{Binding ConfigurationSoftwareMsg}" Grid.Column="1"
VerticalAlignment="Center"/>
<TextBlock Text="{Binding SingleDoorMsg}" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1"
TextWrapping="Wrap" TextAlignment="Center" Margin="5,0,5,0"/>
</Grid>
</GroupBox>
</Grid>
</TabItem>
<TabItem Header="{Binding GeneralCam}">
+34 -5
View File
@@ -650,11 +650,11 @@ Public Class OptionsVM
'----------------------------------------------------------------------------------------------------------------------------------------------------
Public ReadOnly Property EnableAssembly As Boolean
Get
Return (OptionModule.m_ConfigurationSoftware = ConfigType.Assembly)
End Get
End Property
'Public ReadOnly Property EnableAssembly As Boolean
' Get
' Return (OptionModule.m_ConfigurationSoftware = ConfigType.Assembly)
' End Get
'End Property
Public Property LightUp As String
Get
@@ -1145,6 +1145,12 @@ Public Class OptionsVM
End Get
End Property
Public ReadOnly Property ConfigurationSoftwareMsg As String
Get
Return "Assembly"
End Get
End Property
Public ReadOnly Property General As String
Get
Return EgtMsg(MSG_MAINWINDOW + 201)
@@ -1676,6 +1682,29 @@ Public Class OptionsVM
End Set
End Property
Private m_VisibilityConfiguration As Visibility = Visibility.Collapsed
Public ReadOnly Property VisibilityConfiguration As Visibility
Get
If (GetMainPrivateProfileInt(S_GENERAL, "Debug", 0) > 4) Then
m_VisibilityConfiguration = Visibility.Visible
End If
Return m_VisibilityConfiguration
End Get
End Property
Private m_EnableAssembly As Boolean = If(OptionModule.m_ConfigurationSoftware = ConfigType.Assembly, True, False)
Public Property EnableAssembly As Boolean
Get
Return m_EnableAssembly
End Get
Set(value As Boolean)
m_EnableAssembly = value
WriteMainPrivateProfileString(S_GENERAL, K_RUNAS, If(m_EnableAssembly, "1", "0"))
OptionModule.m_ConfigurationSoftware = If(m_EnableAssembly, ConfigType.Assembly, ConfigType.Door)
NotifyPropertyChanged("EnableAssembly")
End Set
End Property
' Controllo di eliminare un bevel dalla lista: 1 se accendo un bevel, 2 se spengo un bevel, -1 tutti i casi che non sono questi
Private Function CheckBevel(VisibilityBevel As Visibility, bValue As Boolean) As Integer
Dim bAnser As Integer
Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B