Correzione creazione nuovo grezzo in macchina

Merge branch 'master' into develop
2022-10-17 14:36:08 +02:00 · 2022-10-06 16:15:58 +02:00
1 changed files with 6 additions and 6 deletions
@@ -1145,14 +1145,14 @@ Public Class RawPartTabVM
         dRawWidth = m_dTableWidth - 2 * dRawKerf
      End If
      If dRawOffsX < dRawKerf Then dRawOffsX = dRawKerf
-      If dRawOffsX + dRawLen + dRawKerf > m_dTableLength Then
-         dRawOffsX = Math.Max(dRawKerf, m_dTableLength - dRawLen - dRawKerf)
-         dRawLen = Math.Min(dRawLen, m_dTableLength - dRawOffsX - dRawKerf)
+      If dRawOffsX + dRawLen + 2 * dRawKerf > m_dTableLength Then
+         dRawOffsX = Math.Max(dRawKerf, m_dTableLength - dRawLen - 2 * dRawKerf)
+         dRawLen = Math.Min(dRawLen, m_dTableLength - dRawOffsX - 2 * dRawKerf)
      End If
      If dRawOffsY < dRawKerf Then dRawOffsY = dRawKerf
-      If dRawOffsY + dRawWidth + dRawKerf > m_dTableWidth Then
-         dRawOffsY = Math.Max(dRawKerf, m_dTableWidth - dRawWidth - dRawKerf)
-         dRawWidth = Math.Min(dRawWidth, m_dTableWidth - dRawOffsY - dRawKerf)
+      If dRawOffsY + dRawWidth + 2 * dRawKerf > m_dTableWidth Then
+         dRawOffsY = Math.Max(dRawKerf, m_dTableWidth - dRawWidth - 2 * dRawKerf)
+         dRawWidth = Math.Min(dRawWidth, m_dTableWidth - dRawOffsY - 2 * dRawKerf)
      End If
      ' Assegno i dati
      SetLength(dRawLen)
Author	SHA1	Message	Date
NicolaP	62953c981e	Correzione creazione nuovo grezzo in macchina	2022-10-17 14:36:08 +02:00
NicolaP	c3a3057420	Merge branch 'master' into develop	2022-10-06 16:15:58 +02:00