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

Iniaziata gestione delle CheckBox per le Alette

Browse Source
This commit is contained in:
NicolaP
2021-10-29 17:05:26 +02:00
parent c768b80802
commit bc06203edd
2 changed files with 101 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SideEntityControl/SideEntityControlV.xaml
+30 -9
View File
@@ -13,17 +13,19 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Visibility="{Binding Legenda_Visibility}"
<!--Titolo delle colonne-->
<Grid Visibility="{Binding Legenda_Visibility}"
Grid.Row="0"
Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.8*"/>
<ColumnDefinition Width="0.6*"/>
<ColumnDefinition Width="0.6*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding FirstColumnMsg}" Grid.Column="1" HorizontalAlignment="Center"/>
<TextBlock Text="{Binding SecondColumnMsg}" Grid.Column="2" HorizontalAlignment="Center"/>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.8*"/>
<ColumnDefinition Width="0.6*"/>
<ColumnDefinition Width="0.6*"/>
</Grid.ColumnDefinitions>
<!--Prima colonna-->
<TextBlock Text="{Binding FirstColumnMsg}" Grid.Column="1" HorizontalAlignment="Center"/>
<!--Seconda colonna-->
<TextBlock Text="{Binding SecondColumnMsg}" Grid.Column="2" HorizontalAlignment="Center"/>
</Grid>
<EgtWPFLib5:EgtScrollViewer VerticalScrollBarVisibility="Auto"
@@ -38,8 +40,10 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<!--Nome della riga ("An")-->
<TextBlock Text="{Binding sEntityName}"
VerticalAlignment="Center"/>
<!--Drip e Engrave-->
<UniformGrid Grid.Column="1" Columns="3" Rows="1">
<CheckBox IsChecked="{Binding bIsChecked}"
@@ -56,6 +60,7 @@
VerticalAlignment="Center"
Margin="2.5,0,0,0"/>
</UniformGrid>
<!--SideAngle-->
<UniformGrid Grid.Column="1" Columns="2" Rows="1">
<EgtWPFLib5:EgtTextBox Text="{Binding GrphSideAngle}"
@@ -67,6 +72,22 @@
VerticalAlignment="Center"
Margin="2.5,0,0,0"/>
</UniformGrid>
<!--Alz&Front-->
<UniformGrid Grid.Column="1" Columns="2" Rows="1">
<CheckBox IsChecked="{Binding bIsCheckedAlz}"
Grid.Column="1"
Visibility="{Binding CheckAlz_Visibility}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<CheckBox IsChecked="{Binding bIsCheckedFront}"
Grid.Column="1"
Visibility="{Binding CheckFront_Visibility}"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</UniformGrid>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
SideEntityControl/SideEntityControlVM.vb
+71 -3
View File
@@ -55,6 +55,9 @@ Public Class SideEntityControlVM
ElseIf m_Mode = SideEntityControlVM.ModeOpt.SIDEANGLE Then
' A°
sMsg = EgtMsg(91653)
ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
' Alz
sMsg = "Alz."
End If
Return sMsg
End Get
@@ -69,6 +72,9 @@ Public Class SideEntityControlVM
ElseIf m_Mode = SideEntityControlVM.ModeOpt.SIDEANGLE Then
' T
sMsg = EgtMsg(91654)
ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
' Front
sMsg = "Front."
End If
Return sMsg
End Get
@@ -384,7 +390,7 @@ Public Class SideEntityControlVM
RefreshSideAngleText()
End If
' Gestisco visualizzazione dei parametri
' Gestisco visualizzazione dei parametri (sotto l'elenco dei parametri)
If m_Mode = ModeOpt.SIDEANGLE Or m_Mode = ModeOpt.FILOTOP Then
Parameter23_Visibility = Windows.Visibility.Hidden
Parameter2_Visibility = Visibility.Visible
@@ -1469,6 +1475,8 @@ Public MustInherit Class SideEntity
Else
Return Visibility.Visible
End If
ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
Return Visibility.Collapsed
Else
Return Visibility.Collapsed
End If
@@ -1482,6 +1490,8 @@ Public MustInherit Class SideEntity
Else
Return Visibility.Collapsed
End If
ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
Return Visibility.Collapsed
Else
Return Visibility.Visible
End If
@@ -1491,10 +1501,69 @@ Public MustInherit Class SideEntity
' imposto la visibilità delle TextBox per Drip ed Engrave
Public ReadOnly Property Value_Visibility_DE As Visibility
Get
Return Visibility.Visible
If m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
Return Visibility.Collapsed
Else
Return Visibility.Visible
End If
End Get
End Property
'--------------------------ALZ AND FRONT -----------------------------
Public ReadOnly Property CheckAlz_Visibility As Visibility
Get
If m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
Return Visibility.Visible
Else
Return Visibility.Collapsed
End If
End Get
End Property
Public ReadOnly Property CheckFront_Visibility As Visibility
Get
If m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then
Return Visibility.Visible
Else
Return Visibility.Collapsed
End If
End Get
End Property
Private m_bIsCheckedAlz As Boolean = False
Public Property bIsCheckedAlz As Boolean
Get
Return m_bIsCheckedAlz
End Get
Set(value As Boolean)
If value Then
m_bIsCheckedAlz = True
m_bIsCheckedFront = False
Else
m_bIsCheckedAlz = False
End If
NotifyPropertyChanged("bIsCheckedAlz")
NotifyPropertyChanged("bIsCheckedFront")
End Set
End Property
Private m_bIsCheckedFront As Boolean = False
Public Property bIsCheckedFront As Boolean
Get
Return m_bIsCheckedFront
End Get
Set(value As Boolean)
If value Then
m_bIsCheckedAlz = False
m_bIsCheckedFront = True
Else
m_bIsCheckedFront = False
End If
NotifyPropertyChanged("bIsCheckedAlz")
NotifyPropertyChanged("bIsCheckedFront")
End Set
End Property
'--------------------------ALZ AND FRONT -----------------------------
Public MustOverride Property bIsChecked As Boolean
Sub New(nId As Integer, sEntityName As String, nTextId As Integer, Mode As SideEntityControlVM.ModeOpt)
@@ -2044,7 +2113,6 @@ Friend Class AlzAndFrontEntity
End Set
End Property
Sub New(nId As Integer, sEntityName As String, nTextId As Integer, dSideAngle As Double, dSideHeel As Double, Mode As SideEntityControlVM.ModeOpt)
MyBase.New(nId, sEntityName, nTextId, Mode)
m_dSideAngle = dSideAngle