From c5e367e41cf6b79184602311f49cb663443a6898 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 1 Jul 2024 18:07:43 +0200 Subject: [PATCH 1/3] EgtCAM5 2.6g1 : - ricompilazione con cambio versione. --- MainWindow/MainWindowVM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 406c184..61451d5 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -385,8 +385,8 @@ Public Class MainWindowVM EgtSetLockId(sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 2606, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 2606, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2607, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2607, 1, IniFile.m_nKeyOptions) ' Leggo e imposto livello utilizzatore IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1)) ' Imposto abilitazione lavorazioni avanzate diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 4413907..274ea94 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 07634b79b4f2c3a224b8d7a28af789a108506cf0 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Tue, 9 Jul 2024 14:41:29 +0200 Subject: [PATCH 2/3] - correzione funzionamento MTable con due macchine --- Special-Doors/TableUtility.vb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Special-Doors/TableUtility.vb b/Special-Doors/TableUtility.vb index 11f3d43..4d88f3a 100644 --- a/Special-Doors/TableUtility.vb +++ b/Special-Doors/TableUtility.vb @@ -428,18 +428,19 @@ Module TableUtility Dim CurrMachining As MTableMachiningGridBoxItem = SelectedTable.ActiveMachinesList(MachineIndex).MachiningList(MachiningIndex) If CurrMachining.GroupId <> CurrGroupId And Not String.IsNullOrWhiteSpace(CurrMachining.PropertyPar) Then Dim CurrentLine As String = " { MachId = '" & SelectedTable.ActiveMachinesList(MachineIndex).MachId & "', Group = " & (CurrMachining.GroupId * 100).ToString & - ", Property = " & CurrMachining.PropertyPar & " }" - If CurrMachining.GroupId <> LastGroupId Then - CurrentLine &= " ," - End If + ", Property = " & CurrMachining.PropertyPar & " } ," + 'If CurrMachining.GroupId <> LastGroupId Then + ' CurrentLine &= " ," + 'End If NewTableFileContent.Add(CurrentLine) CurrGroupId = CurrMachining.GroupId - ElseIf CurrMachining.GroupId <> CurrGroupId And CurrMachining.GroupId = LastGroupId Then - NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c) + 'ElseIf MachineIndex = SelectedTable.ActiveMachinesList.Count - 1 AndAlso CurrMachining.GroupId <> CurrGroupId And CurrMachining.GroupId = LastGroupId Then + ' NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c) End If Next End If Next + NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c) End Sub Private Sub ReorderMachiningIndex(SelectedTable As MTableListBoxItem) From 62a9dd20488474796a33ff9b77ecab41294db8ba Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 11 Jul 2024 17:15:05 +0200 Subject: [PATCH 3/3] -aggiunto al checkbox note updatesurcetrigger --- .../BeamMillingParameterExpanderV.xaml | 2 +- .../MachiningParameterExpander/ChiselingParameterExpanderV.xaml | 2 +- .../FiveAxisMachinigParameterExpanderV.xaml | 2 +- .../GenMachiningParameterExpanderV.xaml | 2 +- .../MachiningParameterExpander/MortisingParameterExpanderV.xaml | 2 +- .../MachiningParameterExpander/PocketingParameterExpanderV.xaml | 2 +- .../StoneDrillingParameterExpanderV.xaml | 2 +- .../StoneMillingParameterExpanderV.xaml | 2 +- .../StoneSawFinishingParameterExpanderV.xaml | 2 +- .../StoneSawRoughingParameterExpanderV.xaml | 2 +- .../StoneSawingParameterExpanderV.xaml | 2 +- .../SurfFinishingParameterExpanderV.xaml | 2 +- .../SurfRoughingParameterExpanderV.xaml | 2 +- .../WaterjettingParameterExpanderV.xaml | 2 +- .../WoodDrillingParameterExpanderV.xaml | 2 +- .../WoodMillingParameterExpanderV.xaml | 2 +- .../WoodSawingParameterExpanderV.xaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml index 41d53cb..1168b1c 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml @@ -236,7 +236,7 @@ IsReadOnly="False"/> - +