From 228a7513358159359ab7e8b219122b9d47090374 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 6 May 2026 12:16:01 +0200 Subject: [PATCH] Icarus 3.1e1 : - aggiunto parametro di lavorazione SingleLeadIn (default false). --- Icarus/Constants/Const3dPrint.vb | 1 + Icarus/CurrMachiningPanel/CurrMachining.vb | 9 ++++++++- Icarus/MachiningDb/Machining.vb | 8 ++++++++ Icarus/MainWindow/MainWindowM.vb | 4 ++-- Icarus/My Project/AssemblyInfo.vb | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb index e51d043..6410c44 100644 --- a/Icarus/Constants/Const3dPrint.vb +++ b/Icarus/Constants/Const3dPrint.vb @@ -94,6 +94,7 @@ Public Const MAC_INNERSHELLWIDTH = "InnerStrandW" Public Const MAC_OFFSETLEADPOINT = "OffsetLeadPoint" Public Const MAC_LEADIN = "LeadIn" + Public Const MAC_SINGLELEADIN = "SingleLeadIn" Public Const MAC_LEADINTANGDIST = "LeadInTangDist" Public Const MAC_LEADINORTHODIST = "LeadInOrthoDist" Public Const MAC_LEADOUT = "LeadOut" diff --git a/Icarus/CurrMachiningPanel/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb index 38e7209..7f75ef0 100644 --- a/Icarus/CurrMachiningPanel/CurrMachining.vb +++ b/Icarus/CurrMachiningPanel/CurrMachining.vb @@ -231,6 +231,7 @@ Public Class CurrMachiningCathegory New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb, Me), New CurrNumericMachiningParam(MachiningParam.Params.LINKPARAM, nPartId, nIndex, bForceFromDb, Me), New CurrComboMachiningParam(MachiningParam.Params.LEADIN, nPartId, nIndex, bForceFromDb, Me), + New CurrCheckMachiningParam(MachiningParam.Params.SINGLELEADIN, nPartId, nIndex, bForceFromDb, Me), New CurrNumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nPartId, nIndex, bForceFromDb, Me), New CurrNumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nPartId, nIndex, bForceFromDb, Me), New CurrComboMachiningParam(MachiningParam.Params.LEADOUT, nPartId, nIndex, bForceFromDb, Me), @@ -646,7 +647,7 @@ Public Class CurrNumericMachiningParam m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type) Case Params.LINKPARAM, Params.INNERSHELLWIDTH, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST, Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED_PC, - Params.WIPELEN, Params.WIPEFEED_PC, Params.SPIRALVASELEN ' Params.WIPEDIR + Params.WIPELEN, Params.WIPEFEED_PC, Params.SPIRALVASELEN, Params.SINGLELEADIN ' Params.WIPEDIR m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type) Case Params.RIBSSTRANDWIDTH, Params.RIBSOVERLAP, Params.RIBSSTRANDOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSLINKFILLET, Params.RIBSMERGEWITHSHELL, Params.RIBSINVERTMERGEDSHELLMAINLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSLEADININVERT, Params.RIBSLEADINLEN, Params.RIBSLEADOUTINVERT, Params.RIBSLEADOUTLEN, Params.RIBSLEADOUTCOASTING, @@ -1212,6 +1213,8 @@ Public Class CurrCheckMachiningParam Select Case Type Case Params.SPIRALVASE bReadFromPart = EgtGetInfo(nPartId, MAC_SPIRALVASE, m_bValue) + Case Params.SINGLELEADIN + bReadFromPart = EgtGetInfo(nPartId, MAC_SINGLELEADIN, m_bValue) Case Params.RIBSLINK bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLINK, m_bValue) Case Params.RIBSMERGEWITHSHELL @@ -1241,6 +1244,8 @@ Public Class CurrCheckMachiningParam Select Case Type Case Params.SPIRALVASE m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type) + Case Params.SINGLELEADIN + m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type) Case Params.RIBSLINK, Params.RIBSMERGEWITHSHELL, Params.RIBSINVERTMERGEDSHELLMAINLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT, Params.RIBSLIMITUNBOUNDEDWITHSOLID m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type) Case Params.AUXSOLIDSINFILLLINK @@ -1259,6 +1264,8 @@ Public Class CurrCheckMachiningParam Select Case Type Case Params.SPIRALVASE EgtSetInfo(nPartId, MAC_SPIRALVASE, If(m_bValue, 1, 0)) + Case Params.SINGLELEADIN + EgtSetInfo(nPartId, MAC_SINGLELEADIN, If(m_bValue, 1, 0)) Case Params.RIBSLINK EgtSetInfo(nPartId, MAC_RIBSLINK, If(m_bValue, 1, 0)) Case Params.RIBSMERGEWITHSHELL diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb index 25eecfc..62405b2 100644 --- a/Icarus/MachiningDb/Machining.vb +++ b/Icarus/MachiningDb/Machining.vb @@ -363,6 +363,7 @@ Public Class MachiningCathegory New ComboMachiningParam(MachiningParam.Params.LINKTYPE, nIndex, Me), New NumericMachiningParam(MachiningParam.Params.LINKPARAM, nIndex, Me), New ComboMachiningParam(MachiningParam.Params.LEADIN, nIndex, Me), + New CheckMachiningParam(MachiningParam.Params.SINGLELEADIN, nIndex, Me), New NumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nIndex, Me), New NumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nIndex, Me), New ComboMachiningParam(MachiningParam.Params.LEADOUT, nIndex, Me), @@ -558,6 +559,7 @@ Public MustInherit Class MachiningParam WIPEFEED_PC = 63 INNERSHELLWIDTH = 64 SPIRALVASELEN = 65 + SINGLELEADIN = 66 'WIPEDIR = 64 RIBSTYPE = 101 RIBSOVERLAP = 102 @@ -693,6 +695,8 @@ Public MustInherit Class MachiningParam m_sName = "Offset Lead Point" Case Params.LEADIN m_sName = "Lead In" + Case Params.SINGLELEADIN + m_sName = "Single Lead In" Case Params.LEADINTANGDIST m_sName = "Lead In Tang Dist" Case Params.LEADINORTHODIST @@ -1763,6 +1767,8 @@ Public Class CheckMachiningParam Select Case Type Case Params.SPIRALVASE m_bValue = ReadMachiningParamDouble(nIndex, MAC_SPIRALVASE, 0) + Case Params.SINGLELEADIN + m_bValue = ReadMachiningParamDouble(nIndex, MAC_SINGLELEADIN, 0) Case Params.RIBSLINK m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLINK, 0) Case Params.RIBSMERGEWITHSHELL @@ -1804,6 +1810,8 @@ Public Class CheckMachiningParam Select Case Type Case Params.SPIRALVASE WriteMachiningParam(nIndex, MAC_SPIRALVASE, If(m_bValue, 1, 0), sFilePath) + Case Params.SINGLELEADIN + WriteMachiningParam(nIndex, MAC_SINGLELEADIN, If(m_bValue, 1, 0), sFilePath) Case Params.RIBSLINK WriteMachiningParam(nIndex, MAC_RIBSLINK, If(m_bValue, 1, 0), sFilePath) Case Params.RIBSMERGEWITHSHELL diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb index c002b94..4522be5 100644 --- a/Icarus/MainWindow/MainWindowM.vb +++ b/Icarus/MainWindow/MainWindowM.vb @@ -191,8 +191,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5583, 3103, 1, m_nKeyLevel) And - EgtGetKeyOptions(5583, 3103, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5583, 3105, 1, m_nKeyLevel) And + EgtGetKeyOptions(5583, 3105, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index 09f171d..5b465cb 100644 --- a/Icarus/My Project/AssemblyInfo.vb +++ b/Icarus/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +