From 28ca22ee351e31db1dc6b5e0bb55114ce8efdbce Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Thu, 2 Dec 2021 11:43:54 +0100
Subject: [PATCH] - Correzione aggiornamento messaggio errore dopo CALC -
 Aggiunta opzione abilitadisabilita area pnte lunghe in nesting

---
 .../BTLViewModel/BTLPartVM.vb                       |  5 +++++
 .../NestingRunningWnd/NestingRunningWndVM.vb        |  7 +++++--
 .../OptimizePanel/OptimizePanelV.xaml               |  4 ++++
 .../OptimizePanel/OptimizePanelVM.vb                | 13 ++++++++++++-
 EgtBEAMWALL.ViewerOptimizer/Utility/LuaExec.vb      |  3 ++-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
index 8a5ac8e5..0fddbd4a 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
@@ -1546,6 +1546,9 @@ Public Class BTLPartVM
             nState = CalcStates.ERROR_
       End Select
       NotifyPropertyChanged(NameOf(Calc_BorderBrush))
+      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
+      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
    End Sub
 
    Friend Sub ResetCalcPart()
@@ -1567,6 +1570,7 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
    End Sub
 
    Friend Sub ResetCalcTotalPart()
@@ -1611,6 +1615,7 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
       m_Calc_PartEnd = True
    End Sub
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb
index f894a710..3e27df27 100644
--- a/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb
@@ -36,6 +36,8 @@ Public Class NestingRunningWndVM
       End Get
    End Property
 
+   Private m_bLDIntersOther As Boolean
+
    Private m_CurrProgress_Value As Double = 0
    Public Property CurrProgress_Value As Double
       Get
@@ -99,8 +101,9 @@ Public Class NestingRunningWndVM
 
 #End Region    ' FIELDS & PROPERTIES
 
-   Sub New(OperationType As OperationTypes, SelPartType As Integer)
+   Sub New(OperationType As OperationTypes, SelPartType As Integer, Optional bLDIntersOther As Boolean = False)
       m_OperationType = OperationType
+      m_bLDIntersOther = bLDIntersOther
       Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
       Dim dSectionTime As Double = GetMainPrivateProfileDouble(S_NEST, K_SECTIONTIME, 1)
       Dim dPartTime As Double = GetMainPrivateProfileDouble(S_NEST, K_PARTTIME, 1)
@@ -248,7 +251,7 @@ Public Class NestingRunningWndVM
          Dim SectionProgress As SectionProgress = m_SectionProgressList(m_SectionIndex)
          ' passo a lua lista id pezzi da nestare
          If SectionProgress.SectionPartList.Count > 0 AndAlso SectionProgress.SParamList.Count > 0 AndAlso
-            Not ExecNesting(sLogPath, CurrentMachine.sMachineName, SectionProgress.SectionPartList, SectionProgress.SParamList, dStartOffset, dOffset, dKerf, SectionProgress.dCalcNestTime) Then
+            Not ExecNesting(sLogPath, CurrentMachine.sMachineName, SectionProgress.SectionPartList, SectionProgress.SParamList, dStartOffset, dOffset, dKerf, m_bLDIntersOther, SectionProgress.dCalcNestTime) Then
             Exit For
          End If
       Next
diff --git a/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
index c91b1ba2..62b2e140 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelV.xaml
@@ -18,6 +18,10 @@
              Width="85"
              Margin="2.5,0,5,0"
              Visibility="Collapsed"/>
+   <CheckBox Content="LongDrill"
+             IsChecked="{Binding bLDIntersOther}"
+             VerticalAlignment="Center"
+             Visibility="{Binding MachiningPage_Visibility}"/>
 
    <Button Content="{Binding Optimize_Msg}"
            Width="70"
diff --git a/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelVM.vb
index e776487d..2913c8c3 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OptimizePanel/OptimizePanelVM.vb
@@ -58,6 +58,16 @@ Public Class OptimizePanelVM
       End Set
    End Property
 
+   Private m_bLDIntersOther As Boolean
+   Public Property bLDIntersOther As Boolean
+      Get
+         Return m_bLDIntersOther
+      End Get
+      Set(value As Boolean)
+         m_bLDIntersOther = value
+      End Set
+   End Property
+
    Private m_Optimize_IsEnabled As Boolean = True
    Public ReadOnly Property Optimize_IsEnabled As Boolean
       Get
@@ -112,6 +122,7 @@ Public Class OptimizePanelVM
       Map.SetRefOptimizePanelVM(Me)
       m_SelPartType = PartTypeList(0)
       m_SelOriginType = OriginTypeList(0)
+      m_bLDIntersOther = False
       NotifyPropertyChanged(NameOf(SelPartType))
    End Sub
 
@@ -225,7 +236,7 @@ Public Class OptimizePanelVM
       If IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.BTLStructureVM.BTLPartVMList) OrElse Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count = 0 Then Return
       ' apro finestra di attesa nesting
       m_bNestingRunning = True
-      Dim NestingRunningWndVM As New NestingRunningWndVM(NestingRunningWndVM.OperationTypes.NESTING, m_SelPartType.Id)
+      Dim NestingRunningWndVM As New NestingRunningWndVM(NestingRunningWndVM.OperationTypes.NESTING, m_SelPartType.Id, m_bLDIntersOther)
       Dim NestingRunningWnd As New NestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM)
       NestingRunningWnd.ShowDialog()
       m_bNestingRunning = False
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/LuaExec.vb b/EgtBEAMWALL.ViewerOptimizer/Utility/LuaExec.vb
index a3152a2d..3c12252b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/LuaExec.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/LuaExec.vb
@@ -70,7 +70,7 @@ Module LuaExec
       Return bOk
    End Function
 
-   Friend Function ExecNesting(sFile As String, sMachine As String, PartList As List(Of BTLPartM), SectionList As List(Of SParam), dStartOffset As Double, dOffset As Double, dKerf As Double, nNestTime As Integer) As Boolean
+   Friend Function ExecNesting(sFile As String, sMachine As String, PartList As List(Of BTLPartM), SectionList As List(Of SParam), dStartOffset As Double, dOffset As Double, dKerf As Double, bLDIntersOther As Boolean, nNestTime As Integer) As Boolean
       If PartList.Count = 0 Then
          EgtOutLog("Exit nesting: no parts received!")
          Return True
@@ -100,6 +100,7 @@ Module LuaExec
       EgtLuaSetGlobNumVar("NEST.STARTOFFSET", dStartOffset)
       EgtLuaSetGlobNumVar("NEST.OFFSET", dOffset)
       EgtLuaSetGlobNumVar("NEST.KERF", dKerf)
+      EgtLuaSetGlobBoolVar("NEST.DRILL_MACH_AREA", bLDIntersOther)
       Dim nNestCorner As Integer
       Select Case CurrentMachine.NestingCorner
          Case MCH_CR.TL