Merge commit '9b89b68684e2d64b043ac6572b75b1cfc0d1515c'

Assembly/Assembly.vb

@@ -3588,14 +3588,9 @@ Public Class Assembly
       If Not bRabbet Then
          'Map.refPartPageVM.CurrPart = Jamb
          CurrCompo = Jamb.AddNewCompo(Map.refCompoPanelVM.CompoTypeList(IndexCompoPanel), True)
-         If Not IsNothing(CurrCompo) Then
-            DirectCast(CurrCompo.CompoParamList(0), ComboBoxParam).SelItem = DirectCast(CurrCompo.CompoParamList(0), ComboBoxParam).ItemList(0)
-         Else
-            ' 50180=Warning : {0} does not exist.
-            MessageBox.Show(String.Format(EgtMsg(50180), Map.refCompoPanelVM.CompoTypeList(IndexCompoPanel).Name & ".frame"), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
+         DirectCast(CurrCompo.CompoParamList(0), ComboBoxParam).SelItem = DirectCast(CurrCompo.CompoParamList(0), ComboBoxParam).ItemList(0)
       Else
-            CurrCompo = Jamb.CompoList(IndexCompo)
+         CurrCompo = Jamb.CompoList(IndexCompo)
       End If
       ' mofico la componete rabbet
       If Not IsNothing(CurrCompo) Then
@@ -3734,14 +3729,9 @@ Public Class Assembly
       If Not bRabbet Then
          ' lo aggiungo
          Local_Compo = Jamb.AddNewCompo(Map.refCompoPanelVM.CompoTypeList(CompoListIndex), True)
-         If Not IsNothing(Local_Compo) Then
-            DirectCast(Local_Compo.CompoParamList(0), ComboBoxParam).SetSelItem(DirectCast(Local_Compo.CompoParamList(0), ComboBoxParam).ItemList(nIndexSide))
-         Else
-            ' 50180=Warning : {0} does not exist.
-            MessageBox.Show(String.Format(EgtMsg(50180), Map.refCompoPanelVM.CompoTypeList(CompoListIndex).Name & ".frame"), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
+         DirectCast(Local_Compo.CompoParamList(0), ComboBoxParam).SetSelItem(DirectCast(Local_Compo.CompoParamList(0), ComboBoxParam).ItemList(nIndexSide))
       Else
-            Local_Compo = Jamb.CompoList(IndexCompo)
+         Local_Compo = Jamb.CompoList(IndexCompo)
       End If
       If Not IsNothing(Local_Compo) Then
          Dim dVal1 As Double = 0

HardwareManager/Hardware.vb

@@ -1876,7 +1876,7 @@ Public Class Hardware
          ' cerco un numero finito di parametri
          For IndexParam As Integer = 0 To IndexParamDDF - 1
             If LineIndex + ParamIndex > sFile.Count - 1 Then Return False
-            ' recupero il nome del parametro 
+            ' recuro il nome del parametro 
             KeyParam = Trim(RegexFunction.KeyParamLine(sFile(LineIndex + ParamIndex)))
             While String.IsNullOrEmpty(KeyParam) And LineIndex + ParamIndex < sFile(LineIndex + ParamIndex).Count
                ParamIndex += 1

MainWindow/MainWindowModel.vb

@@ -57,8 +57,8 @@ Friend Class MainWindowModel
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2604, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2604, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2512, 1, IniFile.m_nKeyOptions)
       'Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

My Project/AssemblyInfo.vb

@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.4.1")>
-<Assembly: AssemblyFileVersion("2.6.4.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

Utility.vb

@@ -304,32 +304,7 @@ Public Module Utility
                   Return "0.0000"
                End If
          End Select
-      ElseIf sValue.Contains("(") And sValue.Contains(")") And sValue.Contains("mm") Then
-         sValue = Trim(sValue.Replace("mm", ""))
-         If sValue.StartsWith("(") And sValue.EndsWith(")") Then
-            Dim ArrayString() As Char = StringToChar(sValue)
-            ArrayString(0) = CChar("§")
-            ArrayString(ArrayString.Count - 1) = CChar("§")
-            sValue = CharToString(ArrayString, sValue)
-            sValue = Trim(sValue.Replace("§", ""))
-         End If
-         If String.IsNullOrEmpty(sValue) Then Return "0.0000"
-         ' ricevo un valore in inches 
-         Select Case OptionModule.m_SelectedMeasureUnit
-            Case ConstGen.MM    ' se la configurazione è inches non faccio conversioni
-               If StringToDouble(sValue, dVal) Then
-                  Return sValue
-               Else
-                  Return "0.0000"
-               End If
-            Case ConstGen.VAL_INCHES      ' se la configurazione è in mm faccio la conevrsione 
-               If MmToInches(sValue) Then
-                  Return sValue
-               Else
-                  Return "0.0000"
-               End If
-         End Select
-      ElseIf sValue.Contains("(") And sValue.Contains(")") And (Not sValue.Contains("inch") Or Not sValue.Contains("mm")) Then
+      ElseIf sValue.Contains("(") And sValue.Contains(")") And Not sValue.Contains("inch") Then
          'sValue = Regex.Match(sValue, "\s*\((.*?)\s*\)\s*\.*").Groups(1).Value
          If String.IsNullOrEmpty(sValue) Then Return "0.0000"
          ' ricevo un valore in mm 
@@ -404,10 +379,6 @@ Public Module Utility
          ' non eseguo nessun tipo di conversione
          Return True
       Else
-         ' la configurazione è già in mm quindi non devo convertire
-         If OptionModule.m_IsMM Then
-            Return True
-         End If
          Return InchesToMm(sMeasure)
       End If
       Return False