diff --git a/ConstIni.vb b/ConstIni.vb index 7b77bf2..ca3b0e6 100644 --- a/ConstIni.vb +++ b/ConstIni.vb @@ -92,6 +92,7 @@ Module ConstIni Public Const K_FLPCURRDIR As String = "CurrDir" Public Const S_SIDES As String = "Sides" + Public Const K_MAXSIDEANGLE As String = "MaxSideAngle" Public Const K_SIDEANGLE As String = "SideAngle" Public Const K_DRIPOFFSET As String = "DripOffset" Public Const K_DRIPDEPTH As String = "DripDepth" diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 3a33bf9..b1d6177 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/SideAngleUc.xaml.vb b/SideAngleUc.xaml.vb index af162ca..faeb08d 100644 --- a/SideAngleUc.xaml.vb +++ b/SideAngleUc.xaml.vb @@ -2,7 +2,6 @@ Public Class SideAngleUC - Friend Const MAX_SIDEANG As Double = 67.5 Public Enum ModeOpt As Integer SIDEANGLE = 0 @@ -13,10 +12,14 @@ Public Class SideAngleUC ' Riferimento alla MainWindow Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) - ' Riferimento alla pagina che ha aperto SideAngleUC Private m_CallingPage As MainWindow.Pages + ' Massimo angolo di lato ammesso + Private Const STD_MAXSIDEANG As Double = 50.0 + Private Const MAX_MAXSIDEANG As Double = 75.0 + Private m_dMaxSideAng As Double = STD_MAXSIDEANG + ' Lista di tutte le entità inclinabili presenti nel progetto Friend m_SideAngleEntityList As New List(Of SideAngleEntity) Friend m_DripEntityList As New List(Of DripEntity) @@ -28,6 +31,10 @@ Public Class SideAngleUC ' Imposto riferimenti ad altre pagine m_CallingPage = m_MainWindow.m_ActivePage + ' Leggo da Ini il massimo angolo di fianco ammesso + m_dMaxSideAng = GetPrivateProfileDouble(S_SIDES, K_MAXSIDEANGLE, STD_MAXSIDEANG, m_MainWindow.GetIniFile()) + If m_dMaxSideAng > MAX_MAXSIDEANG Then m_dMaxSideAng = MAX_MAXSIDEANG + ' Imposto messaggi If m_Mode = ModeOpt.SIDEANGLE Then Parameter1TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 9) ' Angolo @@ -752,11 +759,11 @@ Public Class SideAngleUC Dim dSideAngle As Double StringToDouble(AngleTxBx.Text, dSideAngle) ' Verifico stia nei limiti - If dSideAngle < -MAX_SIDEANG Then - dSideAngle = -MAX_SIDEANG + If dSideAngle < -m_dMaxSideAng Then + dSideAngle = -m_dMaxSideAng AngleTxBx.Text = DoubleToString(dSideAngle, 2) - ElseIf dSideAngle > MAX_SIDEANG Then - dSideAngle = MAX_SIDEANG + ElseIf dSideAngle > m_dMaxSideAng Then + dSideAngle = m_dMaxSideAng AngleTxBx.Text = DoubleToString(dSideAngle, 2) End If ' Converto nome checkbox in nome elemento tenendo conto dello slittamento verso il basso