OmagCUT :
- aggiunta gestione svuotature (manca scelta lavorazione da interfaccia) - ora compilazione richiede dichiarazione delle variabili, modificati di conseguenza i diversi sorgenti.
This commit is contained in:
@@ -886,7 +886,7 @@ Public Class CurrentMachine
|
||||
End Property
|
||||
|
||||
Friend Sub AddMaterial(value As Material)
|
||||
For Each Material In Materials
|
||||
For Each Material As Material In Materials
|
||||
If Material.nId = value.nId Then
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -910,7 +910,7 @@ Public Class CurrentMachine
|
||||
End If
|
||||
Next
|
||||
Dim TempMat As Material = Nothing
|
||||
For I = Index To m_MaxIdMat - 1
|
||||
For I As Integer = Index To m_MaxIdMat - 1
|
||||
GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & I + 2, TempMat, sMachIniFile)
|
||||
WritePrivateProfileMaterial(S_MATERIALS, K_MATERIAL & I + 1, TempMat, sMachIniFile)
|
||||
Next
|
||||
@@ -946,7 +946,7 @@ Public Class CurrentMachine
|
||||
If SysNotes <> String.Empty Then
|
||||
Dim MachiningMaterials() = SysNotes.Split(";".ToCharArray)
|
||||
SysNotes = String.Empty
|
||||
For Each Material In MachiningMaterials
|
||||
For Each Material As Object In MachiningMaterials
|
||||
Dim Param() As String = Material.Split(",".ToCharArray)
|
||||
If Param(0) <> valueId.ToString Then
|
||||
SysNotes &= Material & ";"
|
||||
@@ -975,7 +975,7 @@ Public Class CurrentMachine
|
||||
' Se stringa vuota
|
||||
If String.IsNullOrWhiteSpace(sMatName) Then Return False
|
||||
' Cerco il nome nella lista dei materiali
|
||||
For Index = 0 To Materials.Count - 1
|
||||
For Index As Integer = 0 To Materials.Count - 1
|
||||
If String.Compare(Materials(Index).sName, sMatName, True) = 0 Then
|
||||
CurrMat = Materials(Index)
|
||||
End If
|
||||
@@ -1155,7 +1155,7 @@ Public Class CurrentMachine
|
||||
m_ManualToolChangerNbr = Math.Min(m_ManualToolChangerNbr, MAX_TCMAN_TOOLS)
|
||||
|
||||
' Leggo da file ini nomi e utensili manuali presenti
|
||||
For Index = 1 To m_ManualToolChangerNbr
|
||||
For Index As Integer = 1 To m_ManualToolChangerNbr
|
||||
Dim sName As String = String.Empty
|
||||
Dim sTool As String = String.Empty
|
||||
GetPrivateProfileString(S_TOOLCHANGER, K_MANUALNAME & Index, Nothing, sName, sMachIniFile)
|
||||
@@ -1330,7 +1330,7 @@ Friend Class Material
|
||||
|
||||
Sub New(sName As String, MaterialList As ObservableCollection(Of Material))
|
||||
Dim nMaxId As Integer = 0
|
||||
For Each Material In MaterialList
|
||||
For Each Material As Material In MaterialList
|
||||
If Material.nId > nMaxId Then
|
||||
nMaxId = Material.nId
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user