Miogliorata gestione spostamenti grezzi e cambio versione

This commit is contained in:
NicolaP
2021-10-14 10:50:52 +02:00
parent 6117963ac1
commit 03cb508bbd
3 changed files with 14 additions and 6 deletions
+2 -1
View File
@@ -94,8 +94,9 @@ Public Class MoveRawPartPage
End If
' Carico i parametri di movimento
m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile())
' Ricavo la lunghezza del baffo di taglio
m_dStep = SplitAuto.MaxCuttingMustache(m_dStep)
StepMoveTxBx.Text = LenToString(m_dStep, 1)
StepMoveTxBx.Text = LenToString(m_dStep, 1) & "+1"
m_dRotation = GetPrivateProfileDouble(S_RAWMOVE, K_RAWROTATION, 30, m_MainWindow.GetIniFile())
RotationAngleTxBx.Text = DoubleToString(m_dRotation, 3)
' Se movimento manuale perpendicolare
+10 -3
View File
@@ -826,8 +826,9 @@ Public Module SplitAuto
Dim MachSplitList As New List(Of SplitMach)
' Recupero l'indice della fase corrente
Dim nCurrPhase As Integer = EgtGetCurrPhase()
' se non è stata creata nessuna lista allora restituisco il valore di Default
If Not CalculateSplitMachList(nCurrPhase, MachSplitList) Then Return dMustache
dMustache = 0
Dim NewMustache As Double = 0
Dim ItemMachSplit As SplitMach
For Each ItemMachSplit In MachSplitList
' Recupero lunghezza baffo secondo taglio
@@ -835,10 +836,16 @@ Public Module SplitAuto
EgtGetInfo(EgtGetFirstNameInGroup(ItemMachSplit.m_nId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
Dim dDT As Double
If EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT) Then
If dMustache < dDT Then dMustache = dDT
If NewMustache < dDT Then NewMustache = dDT
End If
Next
Return dMustache
Dim dExtraL As Double = 0
EgtMdbGetGeneralParam(MCH_GP.EXTRALONCUTREG, dExtraL)
' se esiste il valore di un baffo allora sovrascrivo il valore di default
If NewMustache > 0 Then
dMustache = Math.Ceiling(NewMustache)
End If
Return dMustache + dExtraL
End Function
End Module
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.10.1")>
<Assembly: AssemblyFileVersion("2.3.10.1")>
<Assembly: AssemblyVersion("2.3.10.2")>
<Assembly: AssemblyFileVersion("2.3.10.2")>