From 7d554efe60abb69fae1fb523aa17bf2e17e863bd Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 6 Apr 2023 18:03:24 +0200 Subject: [PATCH] EgtMachKernel 2.5d2 : - in taglio con lama modificato riconsocimento Fsta e Fend ora devono essere del tipo "Key=F,PuRed;" . --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes Sawing.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index a1ef62e9fb02b345a354170440ac62fbfc7aecec..5c3ee17a78b8c7b6757401e93c637e18a186f56a 100644 GIT binary patch delta 97 zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmU8!BZvS1 delta 97 zcmewt{V#gMFE&QQ&A-`fnHdcyKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmU3rBY*$^ diff --git a/Sawing.cpp b/Sawing.cpp index ed2cccb..3331bb6 100644 --- a/Sawing.cpp +++ b/Sawing.cpp @@ -1851,10 +1851,10 @@ Sawing::ProcessLine( const ICurve* pCrvP, const ICurveLine* pLineC, const ICurve // Eventuale variazioni di velocità all'inizio e alla fine del percorso FseVar FvVar ; if ( pCrvP == nullptr) { - string sFsta = ExtractInfo( m_Params.m_sUserNotes, "Fsta:") ; + string sFsta = ExtractInfo( m_Params.m_sUserNotes, "Fsta=") ; if ( ! sFsta.empty()) { string sLen, sPu ; - SplitFirst( sFsta, "=", sLen, sPu) ; + SplitFirst( sFsta, ",", sLen, sPu) ; FromString( sLen, FvVar.dLenStart) ; FvVar.dLenStart = max( FvVar.dLenStart, 0.) ; FromString( sPu, FvVar.dPuStart) ; @@ -1862,10 +1862,10 @@ Sawing::ProcessLine( const ICurve* pCrvP, const ICurveLine* pLineC, const ICurve } } if ( pCrvN == nullptr) { - string sFend = ExtractInfo( m_Params.m_sUserNotes, "Fend:") ; + string sFend = ExtractInfo( m_Params.m_sUserNotes, "Fend=") ; if ( ! sFend.empty()) { string sLen, sPu ; - SplitFirst( sFend, "=", sLen, sPu) ; + SplitFirst( sFend, ",", sLen, sPu) ; FromString( sLen, FvVar.dLenEnd) ; FvVar.dLenEnd = max( FvVar.dLenEnd, 0.) ; FromString( sPu, FvVar.dPuEnd) ;