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"/>
+