Merge commit '349a1429c12a249966201c56b23c13fb08a79d51'

Constants/ConstIni.vb

@@ -114,6 +114,7 @@ Module ConstIni
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
    Public Const K_FILOTOPROUNDOFF As String = "FiloTopRoundOff"
+   Public Const K_TEXTCOLORENT As String = "TextColorEnt"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"

MainWindow/MainWindowM.vb

@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2603, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2603, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.2.2")>
-<Assembly: AssemblyFileVersion("2.6.2.2")>
+<Assembly: AssemblyVersion("2.6.3.1")>
+<Assembly: AssemblyFileVersion("2.6.3.1")>
 

SideEntityControl/SideEntityControlVM.vb

@@ -7,6 +7,8 @@ Public Class SideEntityControlVM
 
    Private Const INFO_ALZFRONT As String = "AF"
 
+   Private ColorText As New Color3d(0, 0, 0)
+
    Public Enum ModeOpt As Integer
       SIDEANGLE = 0   ' inclina lato
       DRIP = 1        ' incidi da sotto
@@ -543,7 +545,7 @@ Public Class SideEntityControlVM
       NotifyPropertyChanged("SideEntityList")
       m_SideAngleCheck = If(GetMainPrivateProfileInt(S_COMPO, K_SIDEMODE, 0) = 0, True, False)
       SideAngleEntity.dMaxSideAng = GetMainPrivateProfileDouble(S_SIDES, K_MAXSIDEANGLE, SideAngleEntity.STD_MAXSIDEANG)
-
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, ColorText)
       '------------------ DEFINIZIONE LISTA LATI
       ' creo la lista dei parametri 
       If CallingWindow = CallingWindowOpt.COMPO Then
@@ -704,7 +706,7 @@ Public Class SideEntityControlVM
       Else
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       ' Se modalità angoli di inclinazione...
@@ -773,7 +775,7 @@ Public Class SideEntityControlVM
       If TextLayer = GDB_ID.NULL Then
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       Dim PrevLine As Integer = EgtGetLastInGroup(LoopId)
@@ -1515,20 +1517,22 @@ Public Class SideEntityControlVM
    End Sub
 
    Shared Sub WriteSideAngleForNest(nCtx As Integer)
+      Dim LocalColor As New Color3d(0, 0, 0)
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, LocalColor)
       ' Imposto contesto corrente
       EgtSetCurrentContext(nCtx)
       Dim PartId As Integer = EgtGetFirstPart()
       While PartId <> GDB_ID.NULL
          ' Se richiesti lati paralleli con misura sul top come in TRF, verifico e aggiusto
-         If GetMainPrivateProfileInt( S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
-            AdjustAsTrfParSides( PartId)
-         End If 
+         If GetMainPrivateProfileInt(S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
+            AdjustAsTrfParSides(PartId)
+         End If
          ' Elimino eventuale precedente layer per testi
          EgtErase(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
          ' Creo layer per testi nesting
          Dim TextLayId As Integer = EgtCreateGroup(PartId)
          EgtSetName(TextLayId, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayId, New Color3d(0, 0, 128))
+         EgtSetColor(TextLayId, LocalColor)
          ' Opero su geometria esterna pezzo
          WriteSideAngleOnLoop(EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP), TextLayId)
          ' Ciclo su geometria interna pezzo