Cambio versione 2.4e5

Constants/ConstIni.vb

@@ -133,7 +133,6 @@ Module ConstIni
    Public Const K_ENGRAVENUMBER2 As String = "EngraveNumber2"
    Public Const K_ENGRAVEOFFSET2 As String = "EngraveOffset2"
    Public Const K_ENGRAVEDEPTH As String = "EngraveDepth"
-   Public Const K_ENGRAVEDEPTH2 As String = "EngraveDepth2"
    Public Const K_ENGRAVESHORT As String = "EngraveShort"
    Public Const K_DRIPOFFSET As String = "DripOffset"
    Public Const K_DRIPOFFSET2 As String = "DripOffset2"

DrawImport/AlzFrontUC.xaml.vb

@@ -76,9 +76,9 @@ Public Class AlzFrontUC
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
 
       ' nome dei parametri condivisi
-      Parameter1TxBl.Text = "Altezza"
-      Parameter2TxBl.Text = "Delta angolo"
-      Parameter5TxBl.Text = "Spessore"
+      Parameter1TxBl.Text = EgtMsg(91134)
+      Parameter2TxBl.Text = EgtMsg(91135)
+      Parameter5TxBl.Text = EgtMsg(91136)
 
       EgtZoom(ZM.ALL)
    End Sub

DrawImport/SideAngleUc.xaml.vb

@@ -34,7 +34,6 @@ Public Class SideAngleUC
    Friend m_dDripOffset2 As Double = 0
    Friend m_nEngrNbr2 As Integer = 1
    Friend m_dDripDepth As Double = 10
-   Friend m_dEngraveDepth2 As Double = 15
    Friend m_dDripShort As Double = 0
 
    Private CurrEntityDrip As DripEntity
@@ -134,18 +133,9 @@ Public Class SideAngleUC
          ' Affondamento
          Parameter3TxBl.Visibility = Windows.Visibility.Visible
          Parameter3TxBx.Visibility = Windows.Visibility.Visible
-
          ' Accorciamento
-         If m_Mode = ModeOpt.ENGRAVE Then
-            ' modifico il nome del messaggio 
-            Parameter4TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11) & "2"     ' Affondamento2
-            Parameter4TxBl.Visibility = Windows.Visibility.Visible
-            Parameter4TxBx.Visibility = Windows.Visibility.Visible
-         Else
-            Parameter4TxBl.Visibility = Windows.Visibility.Hidden
-            Parameter4TxBx.Visibility = Windows.Visibility.Hidden
-         End If
-
+         Parameter4TxBl.Visibility = Windows.Visibility.Hidden
+         Parameter4TxBx.Visibility = Windows.Visibility.Hidden
       End If
 
       ' Gestisco Checkbox e nomi in base al numero di lati inclinabili
@@ -166,12 +156,12 @@ Public Class SideAngleUC
          m_nEngrNbr2 = GetPrivateProfileInt( S_SIDES, K_ENGRAVENUMBER2, 1, m_MainWindow.GetIniFile())
          m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
          m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
-         m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
+         m_dDripShort = GetPrivateProfileDouble( S_SIDES, K_ENGRAVESHORT, 0, m_MainWindow.GetIniFile())
          Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
          Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
          Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
          Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
-         Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
+         Parameter4TxBx.Text = LenToString( m_dDripShort, 3)
       End If
 
       ' Aggiorno visualizzazione
@@ -499,7 +489,6 @@ Public Class SideAngleUC
          WritePrivateProfileString( S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET2, LenToString(m_dDripOffset2, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
-         WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
          'WritePrivateProfileString( S_SIDES, K_ENGRAVESHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
       End If
 
@@ -646,7 +635,7 @@ Public Class SideAngleUC
       SideAngle.AddTextToLine(sEntityName, TextLayer, CurrLine, 20, dBBoxRad, True)
    End Sub
 
-   ' Funzione che crea le geometrie dei gocciolatoi (NON UTILIZZATA)
+   ' Funzione che crea le geometrie dei gocciolatoi
    Friend Sub CreateDripGeomOLD(nPartId As Integer)
       ' Recupero Id layer di contorno esterno
       Dim nOutLoopId = EgtGetFirstNameInGroup(nPartId, NAME_OUTLOOP)
@@ -841,9 +830,6 @@ Public Class SideAngleUC
       Dim nCrvId = EgtGetFirstInGroup(DripLayer)
       While nCrvId <> GDB_ID.NULL
          EgtOffsetCurve(nCrvId, -m_dDripOffset, OFF_TYPE.EXTEND)
-         If m_Mode = ModeOpt.ENGRAVE Then
-            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
-         End If
          nCrvId = EgtGetNext(nCrvId)
       End While
       ' Eventuali curve aggiuntive con offset2
@@ -854,14 +840,10 @@ Public Class SideAngleUC
             For i As Integer = 1 To m_nEngrNbr2
                Dim nNewId As Integer = EgtCopy(nCrvId, nCrvId, GDB_POS.AFTER)
                EgtOffsetCurve(nNewId, -i * m_dDripOffset2, OFF_TYPE.EXTEND)
-               If m_Mode = ModeOpt.ENGRAVE Then
-                  EgtSetInfo(nNewId, INFO_DEPTH, m_dEngraveDepth2)
-               End If
             Next
             nCrvId = nNextCrvId
          End While
       End If
-
       If m_Mode = ModeOpt.DRIP Then
          ' Esplodo nelle curve componenti
          nCrvId = EgtGetFirstInGroup(DripLayer)
@@ -884,12 +866,11 @@ Public Class SideAngleUC
          nCrvId = EgtGetFirstInGroup(DripLayer)
          While nCrvId <> GDB_ID.NULL
             EgtSetColor(nCrvId, COL_MCH_DRIPCUT())
-            'EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
+            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
             EgtSetInfo(nCrvId, INFO_STRICT, If(m_dDripShort > EPS_SMALL, "3", "0"))
             nCrvId = EgtGetNext(nCrvId)
          End While
       End If
-
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
@@ -1323,16 +1304,11 @@ Public Class SideAngleUC
    End Sub
 
    Private Sub Parameter4TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter4TxBx.EgtClosed
-      If m_Mode = ModeOpt.DRIP Then
+      If m_Mode = ModeOpt.DRIP Or m_Mode = ModeOpt.ENGRAVE Then
          ' Recupero il valore
          StringToLen(Parameter4TxBx.Text, m_dDripShort)
          ' Creo le geometrie dei gocciolatoi
          RefreshSideAngleText()
-      ElseIf m_Mode = ModeOpt.ENGRAVE Then
-         ' Recupero il valore
-         StringToLen(Parameter4TxBx.Text, m_dEngraveDepth2)
-         ' Creo le geometrie dei gocciolatoi
-         RefreshSideAngleText()
       End If
    End Sub
 

My Project/AssemblyInfo.vb

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

Project/ProjectMgrUC.xaml.vb

@@ -753,7 +753,7 @@ Public Class ProjectMgrUC
       Else
          m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
          EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
-         EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
+         EgtResetMark(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
       End If
       ' aggiorno il disegno
       EgtDraw()