Egalware/EgtWPFLib5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ff4c719b186d96545330fd1c6fe73a6bad215a70'

Browse Source
This commit is contained in:
Dario Sassi
2025-11-13 11:38:34 +01:00
parent 5fe5108547 ff4c719b18
commit b29cc7ba33
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachiningDbWindow/MachiningTreeView.vb
+2 -1
View File
@@ -4765,7 +4765,7 @@ Public Class MachiningTreeViewItem
Return m_bToolNoteVisibility
End Get
End Property
Friend Sub SetToolNoteVisibility(value As Visibility)
Public Sub SetToolNoteVisibility(value As Visibility)
m_bToolNoteVisibility = value
NotifyPropertyChanged(NameOf(ToolNoteVisibility))
End Sub
@@ -7431,6 +7431,7 @@ Public Class MachiningTreeViewItem
Next
SetToolNoteVisibility(If(m_NotesList.Count > 0, Visibility.Visible, Visibility.Collapsed))
SetComboAddVisibility(If(m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed))
NotifyPropertyChanged(NameOf(NotesList))
NotifyPropertyChanged(NameOf(UserNotes))
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.11.1")>
<Assembly: AssemblyFileVersion("2.7.11.1")>
<Assembly: AssemblyVersion("2.7.11.2")>
<Assembly: AssemblyFileVersion("2.7.11.2")>
ToolDbWindow/ToolTreeView.vb
+18 -13
View File
@@ -1,6 +1,6 @@
Imports System.IO
Imports System.Collections.ObjectModel
Imports System.Collections.ObjectModel
Imports EgtUILib
Imports System.IO
Public Class FamilyToolTreeViewItem
Inherits InheritableTreeViewItem
@@ -2732,11 +2732,12 @@ Public Class ToolTreeViewItem
''' Recupero la lista delle Note dal file Note.ini
''' </summary>
Public Sub GetNoteList()
' Recupero direttorio della macchina corrente
Dim sMachDir As String = ""
EgtGetCurrMachineDir(sMachDir)
Dim mNoteDictionary As New Dictionary(Of String, Integer)
' Recupero ToolHolder dal direttorio THolders
m_THolders.Clear()
Dim filePaths As String() = Directory.GetFiles(sMachDir & "\" & T_HOLDER)
@@ -2761,6 +2762,7 @@ Public Class ToolTreeViewItem
If sKeyVal.Count() >= 1 AndAlso Not String.IsNullOrWhiteSpace(sKeyVal(0)) Then
' Assegno chiave
tmpDsc.Add(sKeyVal(0))
mNoteDictionary.Add(sKeyVal(0), Index)
' Assegno valore o indicazione sua mancanza
If sKeyVal.Count() >= 2 Then
tmpVal.Add(sKeyVal(1))
@@ -2784,21 +2786,21 @@ Public Class ToolTreeViewItem
' Aggiungo alla lista NoteList le note presenti nel file ini
If tmpDsc(IndexNoteUser) = sNotes(1) Then
If sNotes(0).Equals("th") Then
m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_THolders))
m_NotesList.Add(New NoteListBoxItem(mNoteDictionary(tmpDsc(IndexNoteUser)), sNotes(0), sNotes(1), m_THolders))
m_NotesList(m_NotesList.Count - 1).SelListValue = tmpVal(IndexNoteUser)
ElseIf sNotes(0).Equals("tl") Then
m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_ToolItemNameList))
m_NotesList.Add(New NoteListBoxItem(mNoteDictionary(tmpDsc(IndexNoteUser)), sNotes(0), sNotes(1), m_ToolItemNameList))
m_NotesList(m_NotesList.Count - 1).SelListValue = tmpVal(IndexNoteUser)
ElseIf sNotes(0).Equals("d") OrElse sNotes(0).Equals("dr") Then
Dim dVal As Double = 0
StringToDouble( tmpVal(IndexNoteUser), dVal)
m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), DoubleToString( dVal, 4)))
Dim dVal As Double = 0
StringToDouble(tmpVal(IndexNoteUser), dVal)
m_NotesList.Add(New NoteListBoxItem(mNoteDictionary(tmpDsc(IndexNoteUser)), sNotes(0), sNotes(1), DoubleToString(dVal, 4)))
ElseIf sNotes(0).Equals("l") OrElse sNotes(0).Equals("lr") Then
Dim dVal As Double = 0
StringToDouble( tmpVal(IndexNoteUser), dVal)
m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), LenToString( dVal, 4)))
Dim dVal As Double = 0
StringToDouble(tmpVal(IndexNoteUser), dVal)
m_NotesList.Add(New NoteListBoxItem(mNoteDictionary(tmpDsc(IndexNoteUser)), sNotes(0), sNotes(1), LenToString(dVal, 4)))
Else
m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), tmpVal(IndexNoteUser)))
m_NotesList.Add(New NoteListBoxItem(mNoteDictionary(tmpDsc(IndexNoteUser)), sNotes(0), sNotes(1), tmpVal(IndexNoteUser)))
End If
Exit For
End If
@@ -2839,6 +2841,9 @@ Public Class ToolTreeViewItem
Next
SetToolNoteVisibility(If(m_NotesList.Count > 0, Visibility.Visible, Visibility.Collapsed))
SetComboAddVisibility(If(m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed))
m_NotesList = New ObservableCollection(Of NoteListBoxItem)(m_NotesList.OrderBy(Function(item) item.Id))
NotifyPropertyChanged(NameOf(UserNotes))
NotifyPropertyChanged(NameOf(NotesList))
@@ -2869,7 +2874,7 @@ Public Class ToolTreeViewItem
sNotes(Index) = sNotes(Index).Trim()
Next
'Assegno valori alla lista temporanea
If sNotes.Count < 3 Then
If sNotes.Count < 3 AndAlso Not sNotes(0).Equals("th") AndAlso Not sNotes(0).Equals("tl") Then
tmpsNotes.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), ""))
ElseIf sNotes(0).Equals("th") Then
tmpsNotes.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), m_THolders))