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

EgtCAM5 2.4h3 :

Browse Source 
- modifiche per entrare in modalità LAVORA senza pezzi in modo corretto
This commit is contained in:
DarioS
2022-08-29 07:29:31 +02:00
parent 9e2a9fa1ec
commit 07b9ff800d
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachGroupPanel/MyMachGroupPanelVM.vb
+7
View File
@@ -208,6 +208,13 @@ Public Class MyMachGroupPanelVM
EgtOutLog("Errore nel posizionamento dei pezzi")
Return False
End If
Else
Dim sTabNames As String = ""
EgtGetAllTablesNames(sTabNames)
Dim sItems() As String = sTabNames.Split(","c).ToArray
If sItems.Count() > 0 Then
EgtSetTable( sItems(0))
End If
End If
Else
EgtOutLog("Machine without InitDisp script.")
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,6 +70,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.8.2")>
<Assembly: AssemblyFileVersion("2.4.8.2")>
<Assembly: AssemblyVersion("2.4.8.3")>
<Assembly: AssemblyFileVersion("2.4.8.3")>
Project/ProjectVM.vb
+2 -2
View File
@@ -356,7 +356,7 @@ Public Class ProjectVM
' Verifico se travi o pareti (dal nome della macchina)
Dim sBeamMachines As String = ""
GetPrivateProfileString(S_BEAM, K_BEAMMACHINES, "", sBeamMachines)
Dim vsBMachs() As String = sBeamMachines.Split(","c).ToArray
Dim vsBMachs() As String = sBeamMachines.Split(","c)
Dim bBeam As Boolean = False
For Each sBMach In vsBMachs
If Not String.IsNullOrWhiteSpace(sBMach) AndAlso sMachine.StartsWith(sBMach, True, CultureInfo.InvariantCulture) Then
@@ -719,7 +719,7 @@ Public Class ProjectVM
Try
Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_PEZFilePath, ".txt")
Dim Lines() As String = File.ReadAllLines(sErrFilePath)
Dim values() As String = Lines(0).Split("="c).ToArray
Dim values() As String = Lines(0).Split("="c)
Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1))
Dim sErrMsg As String = String.Empty
For Index = 1 To Lines.Count - 1
SetUp/SetUpVM.vb
+3 -3
View File
@@ -345,7 +345,7 @@ Public Class SetUpVM
Dim sToolList As New List(Of String)
Dim sToolNameList As New List(Of String)
' la spezzo sui ;
Dim sItems() As String = sPosition.Split(";".ToCharArray)
Dim sItems() As String = sPosition.Split(";"c)
' se c'è almeno un elemento sono sicuro che ci sia la T
If sItems.Count() >= 1 Then
Dim nGroup As Integer = 0
@@ -365,13 +365,13 @@ Public Class SetUpVM
' se ci sono almeno tre elementi sono sicuro che ci sia almeno un'uscita attrezzata
If sItems.Count >= 3 Then
' separo le uscite divise dalla ,
Dim sExitToolAssList() As String = sItems(2).Split(",".ToCharArray)
Dim sExitToolAssList() As String = sItems(2).Split(","c)
sExitList.Clear()
sToolList.Clear()
sToolNameList.Clear()
' creo le liste di uscite e utensili attrezzati ricavati
For AssIndex = 0 To sExitToolAssList.Count() - 1
Dim sExitToolAssItem() As String = sExitToolAssList(AssIndex).Split("/".ToCharArray)
Dim sExitToolAssItem() As String = sExitToolAssList(AssIndex).Split("/"c)
If sExitToolAssItem.Count > 1 Then
sExitList.Add(sExitToolAssItem(0))
sToolList.Add(sExitToolAssItem(1))
ToolsDbWindow/ToolsUpdate.vb
+1 -1
View File
@@ -76,7 +76,7 @@ Module ToolsUpdate
' Leggo la linea
Dim sLine As String = sr.ReadLine()
' La divido usando come separatore ';'
Dim sItems() As String = sLine.Split(";".ToCharArray)
Dim sItems() As String = sLine.Split(";"c)
' Ci devono essere almeno tre parti
If sItems.Count() < 3 Then Continue Do
' Leggo i valori
TopCommandBar/TopCommandBarVM.vb
+1 -1
View File
@@ -615,7 +615,7 @@ Public Class TopCommandBarVM
' preparo la mail per il supporto
Dim bEx As Boolean = False
Try
Dim sAddressArray As String() = sSupportAddress.Split(CType(",", Char()))
Dim sAddressArray As String() = sSupportAddress.Split(","c)
Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("EgtCAM5 Feedback - " & sKey)
SendFeedbackWindow.Recipients.Add(sAddressArray(0))
For index As Integer = 1 To sAddressArray.Length() - 1
Utility/IniFile.vb
+5 -5
View File
@@ -151,7 +151,7 @@ Public Module IniFile
Public Function GetPrivateProfileFloatingWinPos(lpAppName As String, lpKeyName As String, ByRef nState As String, ByRef nIndex As Integer, ByRef nLeft As Integer, ByRef nTop As Integer) As Boolean
Dim sVal As String = String.Empty
GetPrivateProfileString(lpAppName, lpKeyName, "", sVal)
Dim sItems() As String = sVal.Split(",".ToCharArray)
Dim sItems() As String = sVal.Split(","c)
If sItems.Count() >= 4 Then
nState = sItems(0)
nIndex = CInt(sItems(1))
@@ -168,7 +168,7 @@ Public Module IniFile
Dim sVal As String = String.Empty
GetPrivateProfileString(lpAppName, lpKeyName, "", sVal)
Dim sItems() As String = sVal.Split(",".ToCharArray)
Dim sItems() As String = sVal.Split(","c)
If sItems.Count() = 2 Then
Return New Language(sItems(0), sItems(1))
End If
@@ -182,7 +182,7 @@ Public Module IniFile
Dim sVal As String = String.Empty
EgtUILib.GetPrivateProfileString(lpAppName, lpKeyName, "", sVal, m_sCurrMachIniFilePath)
Dim sItems() As String = sVal.Split(",".ToCharArray)
Dim sItems() As String = sVal.Split(","c)
If sItems.Count() = 2 Then
sName = sItems(0)
nTot = CInt(sItems(1))
@@ -196,7 +196,7 @@ Public Module IniFile
ByVal lpKeyName As String, ByRef sTcPos As String, ByRef sHead As String, ByRef nGroup As Integer) As Boolean
Dim sVal As String = String.Empty
EgtUILib.GetPrivateProfileString(lpAppName, lpKeyName, "", sVal, m_sCurrMachIniFilePath)
Dim sItems() As String = sVal.Split(";".ToCharArray)
Dim sItems() As String = sVal.Split(";"c)
If sItems.Count() >= 2 Then
sTcPos = sItems(0)
sHead = sItems(1)
@@ -215,7 +215,7 @@ Public Module IniFile
Dim sVal As String = String.Empty
GetPrivateProfileString(sSection, sKey, "", sVal)
If String.IsNullOrWhiteSpace(sVal) Then Return False
Dim sItems() As String = sVal.Split(",".ToCharArray)
Dim sItems() As String = sVal.Split(","c)
If sItems.Count() >= 1 Then
Dim sLuaPath As String = sItems(0)
Dim sImagePath As String = If(sItems.Count() >= 2, sItems(1), "")