Icarus 3.1b1 :

- prime modifiche per aggiungere tipo di slicing MultiPlanar.
This commit is contained in:
Dario Sassi
2026-02-11 20:04:01 +01:00
parent 6827c7f971
commit 738945927b
7 changed files with 24 additions and 9 deletions
+1
View File
@@ -26,6 +26,7 @@ Public Module ConstMachDataIni
Public Const S_45DEGX As String = "45DegX"
Public Const S_45DEGY As String = "45DegY"
Public Const S_HORIZONTAL As String = "Horizontal"
Public Const S_MULTIPLANAR As String = "MultiPlanar"
Public Const K_MINX As String = "MinX"
Public Const K_MAXX As String = "MaxX"
Public Const K_MINY As String = "MinY"
@@ -962,6 +962,9 @@ Public Class CurrComboMachiningParam
m_ValueList.Add(New IdNameStruct(Machining.MPAR_SLICINGTYPE.DEG45_Y, "45deg Y"))
If nSlicingType >= 3 Then
m_ValueList.Add(New IdNameStruct(Machining.MPAR_SLICINGTYPE.HORIZONTAL, "Horizontal"))
If nSlicingType >= 4 Then
m_ValueList.Add(New IdNameStruct(Machining.MPAR_SLICINGTYPE.MULTIPLANAR, "MultiPlanar"))
End If
End If
End If
End If
+5 -1
View File
@@ -14,6 +14,7 @@ Public Class Machining
DEG45 = 2
DEG45_Y = 3
HORIZONTAL = 4
MULTIPLANAR = 5
End Enum
Public Enum MPAR_STRANDORDERS As Integer
@@ -648,7 +649,7 @@ Public MustInherit Class MachiningParam
m_Cathegory = Cathegory
Select Case m_Type
Case Params.SLICINGTYPE
m_sName = "Slicing Direction"
m_sName = "Slicing Type"
Case Params.STRANDH
m_sName = "Strand Height"
Case Params.STRANDW
@@ -1502,6 +1503,9 @@ Public Class ComboMachiningParam
m_ValueList.Add(New IdNameStruct(Machining.MPAR_SLICINGTYPE.DEG45_Y, "45deg Y"))
If nSlicingType >= 3 Then
m_ValueList.Add(New IdNameStruct(Machining.MPAR_SLICINGTYPE.HORIZONTAL, "Horizontal"))
If nSlicingType >= 4 Then
m_ValueList.Add(New IdNameStruct(Machining.MPAR_SLICINGTYPE.MULTIPLANAR, "MultiPlanar"))
End If
End If
End If
End If
+2 -2
View File
@@ -191,8 +191,8 @@ Public Class MainWindowM
EgtSetLockId( sLockId)
End If
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(5583, 3101, 1, m_nKeyLevel) And
EgtGetKeyOptions(5583, 3101, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(5583, 3102, 1, m_nKeyLevel) And
EgtGetKeyOptions(5583, 3102, 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())
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.1.1")>
<Assembly: AssemblyFileVersion("3.1.1.1")>
<Assembly: AssemblyVersion("3.1.2.1")>
<Assembly: AssemblyFileVersion("3.1.2.1")>
+9 -4
View File
@@ -355,6 +355,7 @@ Public Class MySceneHostVM
"|Iges files (*.igs;*.iges)|*.igs;*.iges" &
"|Step files (*.stp;*.step)|*.stp;*.step" &
"|3D Manufacturing format (*.3mf)|*.3mf" &
"|Rhino format (*.3dm)|*.3dm" &
"|New geometry EgalTech(*.nge)|*.nge" &
"|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
"|All Files (*.*)|*.*",
@@ -418,10 +419,11 @@ Public Class MySceneHostVM
"|Iges files (*.igs;*.iges)|*.igs;*.iges" &
"|Step files (*.stp;*.step)|*.stp;*.step" &
"|3D Manufacturing format (*.3mf)|*.3mf" &
"|Rhino format (*.3dm)|*.3dm" &
"|New geometry EgalTech(*.nge)|*.nge" &
"|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
"|All Files (*.*)|*.*",
.FilterIndex = 6,
.FilterIndex = 7,
.InitialDirectory = sDir}
If Not OpenFileDialog.ShowDialog Then
Return False
@@ -496,10 +498,11 @@ Public Class MySceneHostVM
"|Iges files (*.igs;*.iges)|*.igs;*.iges" &
"|Step files (*.stp;*.step)|*.stp;*.step" &
"|3D Manufacturing format (*.3mf)|*.3mf" &
"|Rhino format (*.3dm)|*.3dm" &
"|New geometry EgalTech(*.nge)|*.nge" &
"|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
"|All Files (*.*)|*.*",
.FilterIndex = 6,
.FilterIndex = 7,
.InitialDirectory = sDir}
If Not OpenFileDialog.ShowDialog Then
Return False
@@ -558,10 +561,11 @@ Public Class MySceneHostVM
"|Iges files (*.igs;*.iges)|*.igs;*.iges" &
"|Step files (*.stp;*.step)|*.stp;*.step" &
"|3D Manufacturing format (*.3mf)|*.3mf" &
"|Rhino format (*.3dm)|*.3dm" &
"|New geometry EgalTech(*.nge)|*.nge" &
"|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
"|All Files (*.*)|*.*",
.FilterIndex = 6,
.FilterIndex = 7,
.InitialDirectory = sDir}
If Not OpenFileDialog.ShowDialog Then
Return False
@@ -636,10 +640,11 @@ Public Class MySceneHostVM
"|Iges files (*.igs;*.iges)|*.igs;*.iges" &
"|Step files (*.stp;*.step)|*.stp;*.step" &
"|3D Manufacturing format (*.3mf)|*.3mf" &
"|Rhino format (*.3dm)|*.3dm" &
"|New geometry EgalTech(*.nge)|*.nge" &
"|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
"|All Files (*.*)|*.*",
.FilterIndex = 6,
.FilterIndex = 7,
.InitialDirectory = sDir}
If Not OpenFileDialog.ShowDialog Then
Return False
+2
View File
@@ -219,6 +219,8 @@ Public Module CurrentMachine
sExtrusionType = S_45DEGY
Case Machining.MPAR_SLICINGTYPE.HORIZONTAL
sExtrusionType = S_HORIZONTAL
Case Machining.MPAR_SLICINGTYPE.MULTIPLANAR
sExtrusionType = S_MULTIPLANAR
End Select
Dim dExtrXMax = GetPrivateProfileDouble(sExtrusionType, K_MAXX, 0, m_sMachDataIniFile)
Dim dExtrXMin = GetPrivateProfileDouble(sExtrusionType, K_MINX, 0, m_sMachDataIniFile)