diff --git a/SideEntityControl/SideEntityControlV.xaml b/SideEntityControl/SideEntityControlV.xaml
index fbad229..9fb760b 100644
--- a/SideEntityControl/SideEntityControlV.xaml
+++ b/SideEntityControl/SideEntityControlV.xaml
@@ -13,17 +13,19 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SideEntityControl/SideEntityControlVM.vb b/SideEntityControl/SideEntityControlVM.vb
index 7cc2f8b..000ab0b 100644
--- a/SideEntityControl/SideEntityControlVM.vb
+++ b/SideEntityControl/SideEntityControlVM.vb
@@ -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