Merge branch 'NicolaP'

HardwareManager/Hardware.vb

@@ -2072,8 +2072,8 @@ Public Class Hardware
                   End Select
                   ' se testo numerico, eseguo opportune conversioni per H,W e T
                   sValue = ConvertFromDGD(Text.TypeVar, sValue)
-                  ' se parametro spento
-                  If Not Text.IsActive Then sValue &= "; 0"
+                  ' se parametro spento (Solo per capitolo DDF)
+                  If Not Text.IsActive AndAlso m_GroupChapters(IndexGroupChapters).TemplateDDFName = "DDF" Then sValue &= "; 0"
                   Return True
                ElseIf TypeOf m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter) Is TextBoxParam Then
                   Dim Text As TextBoxParam = DirectCast(m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter), TextBoxParam)
@@ -2149,7 +2149,7 @@ Public Class Hardware
                   Next
                   sValue = Text.SelItem
                   ' se parametro spento
-                  If Not Text.IsActive Then sValue &= "; 0"
+                  If Not Text.IsActive AndAlso m_GroupChapters(IndexGroupChapters).TemplateDDFName = "DDF" Then sValue &= "; 0"
                   Return True
 
                ElseIf TypeOf m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter) Is ComboBoxParam Then

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, 2406, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2406, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2407, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2407, 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.4.6.1")>
-<Assembly: AssemblyFileVersion("2.4.6.1")>
+<Assembly: AssemblyVersion("2.4.7.1")>
+<Assembly: AssemblyFileVersion("2.4.7.1")>

SceneManager/SceneManagerVM.vb

@@ -109,7 +109,8 @@ Public Class SceneManagerVM
             ' Creazione scena
             PreInitializeScene()
             ' Se tutto bene
-            If m_ProjectScene.Init() And (IniFile.m_nKeyOptions And KEY_OPT.DOORCREATOR) <> 0 Then
+            If m_ProjectScene.Init() And ((IniFile.m_nKeyOptions And KEY_OPT.DOORCREATOR) <> 0 OrElse
+               (Not (IniFile.m_nKeyOptions And KEY_OPT.DOORCREATOR) <> 0 AndAlso (IniFile.m_nKeyOptions And KEY_OPT.READ_ONLY) <> 0)) Then
                EgtSetCurrentContext(m_ProjectScene.GetCtx)
                PostInitializeScene()
                m_ProjectScene.SetStatusNull()