diff --git a/MachGroupPanel/MyMachGroupPanelVM.vb b/MachGroupPanel/MyMachGroupPanelVM.vb index f887d59..08a019c 100644 --- a/MachGroupPanel/MyMachGroupPanelVM.vb +++ b/MachGroupPanel/MyMachGroupPanelVM.vb @@ -318,7 +318,7 @@ Public Class MyMachGroupPanelVM EgtUILib.GetPrivateProfileString(S_MCH_GENERAL, K_MATERIAL, sMatType, sMatType, sMachineIniPath) Select Case sMatType Case MCH_MAT_STONE - EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE + EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE5 Case MCH_MAT_WOOD EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD Case MCH_MAT_BEAM diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 21fe173..ec1070d 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb index 35dfc49..4366d2c 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb @@ -193,7 +193,7 @@ Public Class MachiningParameterExpanderVM Select Case nType Case MCH_OY.DRILLING - If MatType = MaterialType.STONE Then + If MatType = MaterialType.STONE5 Then If IsNothing(StoneDrillParamExpanderV) Then StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV StoneDrillParamExpanderV.DataContext = m_CurrOperation Return StoneDrillParamExpanderV @@ -203,7 +203,7 @@ Public Class MachiningParameterExpanderVM Return WoodDrillParamExpanderV End If Case MCH_OY.SAWING - If MatType = MaterialType.STONE Then + If MatType = MaterialType.STONE5 Then If IsNothing(StoneSawParamExpanderV) Then StoneSawParamExpanderV = New StoneSawingParameterExpanderV StoneSawParamExpanderV.DataContext = m_CurrOperation Return StoneSawParamExpanderV @@ -217,7 +217,7 @@ Public Class MachiningParameterExpanderVM If IsNothing(BeamMillParamExpanderV) Then BeamMillParamExpanderV = New BeamMillingParameterExpanderV BeamMillParamExpanderV.DataContext = m_CurrOperation Return BeamMillParamExpanderV - ElseIf MatType = MaterialType.STONE Then + ElseIf MatType = MaterialType.STONE5 Then If IsNothing(StoneMillParamExpanderV) Then StoneMillParamExpanderV = New StoneMillingParameterExpanderV StoneMillParamExpanderV.DataContext = m_CurrOperation Return StoneMillParamExpanderV @@ -235,7 +235,7 @@ Public Class MachiningParameterExpanderVM StoneSawFinishParamExpanderV.DataContext = m_CurrOperation Return StoneSawFinishParamExpanderV Case MCH_OY.POCKETING - If MatType = MaterialType.STONE Or MatType = MaterialType.STONE5 Then + If MatType = MaterialType.STONE5 Then ' se macchina di tipo STONE ricavo il tipo di utensile Dim sMachiningToolName = String.Empty EgtMdbSetCurrMachining(sName)