diff --git a/CNCommunication.vb b/CNCommunication.vb index 4d3e6c8..1143e05 100644 --- a/CNCommunication.vb +++ b/CNCommunication.vb @@ -124,52 +124,52 @@ Public Class CNCommunication m_nA1 = GetPrivateProfileInt(S_AXES, K_L1ID, 0, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA1) Then m_bAxesOk = False - EgtOutLog("Error on A1ID") + EgtOutLog("Error on L1ID") End If GetPrivateProfileString(S_AXES, K_L2NAME, "Y", m_sA2, m_MainWindow.GetMachIniFile()) m_nA2 = GetPrivateProfileInt(S_AXES, K_L2ID, 1, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA2) Then m_bAxesOk = False - EgtOutLog("Error on A2ID") + EgtOutLog("Error on L2ID") End If GetPrivateProfileString(S_AXES, K_L3NAME, "Z", m_sA3, m_MainWindow.GetMachIniFile()) m_nA3 = GetPrivateProfileInt(S_AXES, K_L3ID, 2, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA3) Then m_bAxesOk = False - EgtOutLog("Error on A3ID") + EgtOutLog("Error on L3ID") End If GetPrivateProfileString(S_AXES, K_R1NAME, "C", m_sA4, m_MainWindow.GetMachIniFile()) m_nA4 = GetPrivateProfileInt(S_AXES, K_R1ID, 8, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA4) Then m_bAxesOk = False - EgtOutLog("Error on A4ID") + EgtOutLog("Error on R1ID") End If GetPrivateProfileString(S_AXES, K_R2NAME, "B", m_sA5, m_MainWindow.GetMachIniFile()) m_nA5 = GetPrivateProfileInt(S_AXES, K_R2ID, 7, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA5) Then m_bAxesOk = False - EgtOutLog("Error on A5ID") + EgtOutLog("Error on R2ID") End If - GetPrivateProfileString(S_AXES, K_R2NAME, "B", m_sA6, m_MainWindow.GetMachIniFile()) - m_nA6 = GetPrivateProfileInt(S_AXES, K_R2ID, 7, m_MainWindow.GetMachIniFile()) + GetPrivateProfileString(S_AXES, K_A6NAME, "A", m_sA6, m_MainWindow.GetMachIniFile()) + m_nA6 = GetPrivateProfileInt(S_AXES, K_A6ID, 6, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA6) Then m_bAxesOk = False EgtOutLog("Error on A6ID") End If - GetPrivateProfileString(S_AXES, K_R2NAME, "B", m_sA7, m_MainWindow.GetMachIniFile()) - m_nA7 = GetPrivateProfileInt(S_AXES, K_R2ID, 7, m_MainWindow.GetMachIniFile()) + GetPrivateProfileString(S_AXES, K_A7NAME, "U", m_sA7, m_MainWindow.GetMachIniFile()) + m_nA7 = GetPrivateProfileInt(S_AXES, K_A7ID, 3, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA7) Then m_bAxesOk = False EgtOutLog("Error on A7ID") End If - GetPrivateProfileString(S_AXES, K_R2NAME, "B", m_sA8, m_MainWindow.GetMachIniFile()) - m_nA8 = GetPrivateProfileInt(S_AXES, K_R2ID, 7, m_MainWindow.GetMachIniFile()) + GetPrivateProfileString(S_AXES, K_A8NAME, "V", m_sA8, m_MainWindow.GetMachIniFile()) + m_nA8 = GetPrivateProfileInt(S_AXES, K_A8ID, 4, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA8) Then m_bAxesOk = False EgtOutLog("Error on A8ID") End If - GetPrivateProfileString(S_AXES, K_R2NAME, "B", m_sA9, m_MainWindow.GetMachIniFile()) - m_nA9 = GetPrivateProfileInt(S_AXES, K_R2ID, 7, m_MainWindow.GetMachIniFile()) + GetPrivateProfileString(S_AXES, K_A9NAME, "W", m_sA9, m_MainWindow.GetMachIniFile()) + m_nA9 = GetPrivateProfileInt(S_AXES, K_A9ID, 5, m_MainWindow.GetMachIniFile()) If Not m_CN.VerifyAxis(m_nA9) Then m_bAxesOk = False EgtOutLog("Error on A9ID") @@ -577,8 +577,8 @@ Public Class CNCommunication dA1 = If(m_nA1 >= 0, m_CN.d_axis_delta(m_nA1), 0) dA2 = If(m_nA2 >= 0, m_CN.d_axis_delta(m_nA2), 0) dA3 = If(m_nA3 >= 0, m_CN.d_axis_delta(m_nA3), 0) - dA1 = If(m_nA4 >= 0, m_CN.d_axis_delta(m_nA4), 0) - dA2 = If(m_nA5 >= 0, m_CN.d_axis_delta(m_nA5), 0) + dA4 = If(m_nA4 >= 0, m_CN.d_axis_delta(m_nA4), 0) + dA5 = If(m_nA5 >= 0, m_CN.d_axis_delta(m_nA5), 0) ' sono giĆ  in mm Return m_bAxesOk End Function @@ -588,12 +588,12 @@ Public Class CNCommunication sA1 = m_sA1 sA2 = m_sA2 sA3 = m_sA3 - sA4 = m_sA1 - sA5 = m_sA2 - sA6 = m_sA2 - sA7 = m_sA2 - sA8 = m_sA2 - sA9 = m_sA2 + sA4 = m_sA4 + sA5 = m_sA5 + sA6 = m_sA6 + sA7 = m_sA7 + sA8 = m_sA8 + sA9 = m_sA9 Return m_bAxesOk End Function diff --git a/ConstMachIni.vb b/ConstMachIni.vb index 76b3da5..b746eaf 100644 --- a/ConstMachIni.vb +++ b/ConstMachIni.vb @@ -19,8 +19,14 @@ Public Const K_R1ID As String = "R1Id" Public Const K_R2NAME As String = "R2Name" Public Const K_R2ID As String = "R2Id" - Public Const K_R3NAME As String = "R3Name" - Public Const K_R3ID As String = "R3Id" + Public Const K_A6NAME As String = "A6Name" + Public Const K_A6ID As String = "A6Id" + Public Const K_A7NAME As String = "A7Name" + Public Const K_A7ID As String = "A7Id" + Public Const K_A8NAME As String = "A8Name" + Public Const K_A8ID As String = "A8Id" + Public Const K_A9NAME As String = "A9Name" + Public Const K_A9ID As String = "A9Id" Public Const K_DELTA_C As String = "DeltaC" Public Const K_ININCHES As String = "InInches" diff --git a/MachineStatusUC.xaml.vb b/MachineStatusUC.xaml.vb index 34519d3..3572b8c 100644 --- a/MachineStatusUC.xaml.vb +++ b/MachineStatusUC.xaml.vb @@ -48,7 +48,7 @@ Public Class MachineStatusUC End If Dim PcType As Integer = GetPrivateProfileInt(S_GENERAL, K_SIEMENSPC, 0, m_MainWindow.GetIniFile()) m_AxesNumber = GetPrivateProfileInt(S_AXES, K_AXESNUM, 5, m_MainWindow.GetMachIniFile()) - If PcType = 1 Then + If PcType <> 0 Then MachineStatusGrid.ColumnDefinitions.Clear() MachineStatusGrid.RowDefinitions.Clear() Dim SeparatorColumn As New ColumnDefinition() diff --git a/MainWindow.xaml b/MainWindow.xaml index 92e4a10..68f91be 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -15,7 +15,7 @@ - + diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 0af8dcb..86d1f4e 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -301,11 +301,11 @@ Class MainWindow ' Creazione gestore comunicazione con macchina CN m_CNCommunication = New CNCommunication ' Posizionamento nella griglia della MachineStatusBar - Dim PcType As Integer = GetPrivateProfileInt(S_GENERAL, K_SIEMENSPC, 1, m_sIniFile) + Dim PcType As Integer = GetPrivateProfileInt(S_GENERAL, K_SIEMENSPC, 0, m_sIniFile) If PcType = 0 Then m_MachineStatusUC.SetValue(Grid.RowProperty, 2) MainWindowGrid.ColumnDefinitions.RemoveAt(MainWindowGrid.ColumnDefinitions.Count - 1) - ElseIf PcType >= 1 Then + Else m_MachineStatusUC.SetValue(Grid.ColumnProperty, 2) m_MachineStatusUC.SetValue(Grid.RowSpanProperty, 3) MainWindowGrid.RowDefinitions.RemoveAt(MainWindowGrid.RowDefinitions.Count - 1) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index aa78508..2d14add 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ToolsDbPageUC.xaml b/ToolsDbPageUC.xaml index 7a79145..e4faeb4 100644 --- a/ToolsDbPageUC.xaml +++ b/ToolsDbPageUC.xaml @@ -259,11 +259,11 @@ - - @@ -282,12 +282,12 @@ - - @@ -311,21 +311,21 @@ - - - - @@ -334,7 +334,7 @@ - @@ -346,7 +346,7 @@ - - - @@ -386,13 +386,13 @@ - + Style="{StaticResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="1" ScrollViewer.VerticalScrollBarVisibility="Disabled" TextWrapping="Wrap"/> + - - + + @@ -400,7 +400,7 @@ -