diff --git a/Icarus/Constants/ConstMachDataIni.vb b/Icarus/Constants/ConstMachDataIni.vb index 917c6fc..9afb1e3 100644 --- a/Icarus/Constants/ConstMachDataIni.vb +++ b/Icarus/Constants/ConstMachDataIni.vb @@ -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" diff --git a/Icarus/CurrMachiningPanel/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb index e4c8c08..dc60a22 100644 --- a/Icarus/CurrMachiningPanel/CurrMachining.vb +++ b/Icarus/CurrMachiningPanel/CurrMachining.vb @@ -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 diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb index b43c5cc..27d4f43 100644 --- a/Icarus/MachiningDb/Machining.vb +++ b/Icarus/MachiningDb/Machining.vb @@ -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 diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb index 0226c35..4567152 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, 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()) diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index 1bec6d6..eecc6a5 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: ' - - + + diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index b6d0516..924de47 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -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 diff --git a/Icarus/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb index fb47939..ca94daa 100644 --- a/Icarus/Utility/CurrentMachine.vb +++ b/Icarus/Utility/CurrentMachine.vb @@ -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)