OmagCUT 1.6n8 :

- aggiornamenti per nesting.
This commit is contained in:
Dario Sassi
2016-02-24 08:22:41 +00:00
parent 5667fb2570
commit b38aa3dce0
3 changed files with 16 additions and 8 deletions
+2 -2
View File
@@ -60,5 +60,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.14.7")>
<Assembly: AssemblyFileVersion("1.6.14.7")>
<Assembly: AssemblyVersion("1.6.14.8")>
<Assembly: AssemblyFileVersion("1.6.14.8")>
+10 -6
View File
@@ -386,14 +386,18 @@ Public Class NestPageUC
' Aggiungo le lavorazioni standard
AddMachinings(nId, True, False)
' Eseguo nesting
Dim bFit As Boolean = False
Dim nKerfId As Integer = EgtGetFirstNameInGroup(m_nRawId, NAME_KERF)
Dim bOk As Boolean = EgtCreateOutRegion(m_nRawId, nKerfId) AndAlso
EgtPackPart(nId, m_bReducedCut, True)
'Dim bOk As Boolean = EgtPackPart(nId, m_bReducedCut,
' m_ptRawMin.x + m_dKerf, m_ptRawMin.y + m_dKerf,
' m_ptRawMax.x - m_dKerf, m_ptRawMax.y - m_dKerf, True)
If EgtCreateOutRegion(m_nRawId, nKerfId) Then
If Not EgtExistsInfo(m_CurrProjPage.m_nRawId, KEY_RAWBYPOINTS) Then
bFit = EgtPackPartInRectangle(nId, m_bReducedCut, True)
End If
If Not bFit Then
bFit = EgtPackPart(nId, m_bReducedCut, True)
End If
End If
' Gestione risultato nesting
If bOk Then
If bFit Then
Return True
Else
EraseMachinings(nId)
+4
View File
@@ -332,6 +332,8 @@ Public Class RawPartPageUC
UpdateRawPartKerf()
' Aggiorno dimensioni grezzo
UpdateRawXYData()
' Salvo il valore del kerf (sempre in mm)
EgtSetInfo(m_CurrProjPage.m_nRawId, KEY_KERF, DoubleToString(m_RawKerf, 4))
' Aggiorno visualizzazione
EgtDraw()
End Sub
@@ -483,6 +485,8 @@ Public Class RawPartPageUC
nKerfId = EgtCreateRectangle2P(m_CurrProjPage.m_nRawId, ptMin, ptMax, GDB_RT.GLOB)
EgtSetName(nKerfId, NAME_KERF)
EgtSetColor(nKerfId, m_KerfCol)
' Salvo il valore del kerf (sempre in mm)
EgtSetInfo(m_CurrProjPage.m_nRawId, KEY_KERF, DoubleToString(m_RawKerf, 4))
Return True
End Function