diff --git a/EgtMachKernel.sln b/EgtMachKernel.sln index 70e1d53..1171052 100644 --- a/EgtMachKernel.sln +++ b/EgtMachKernel.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.645 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EgtMachKernel", "EgtMachKernel.vcxproj", "{0BD58222-92F3-48B2-B656-4497D1956874}" EndProject diff --git a/Milling.cpp b/Milling.cpp index e79d1d3..9f401af 100644 --- a/Milling.cpp +++ b/Milling.cpp @@ -1953,7 +1953,7 @@ Milling::ProcessPath( int nPathId, int nPvId, int nClId) return false ; // recupero eventuale flag di inizio forzato fuori dal grezzo - int nStartOutRaw ; + int nStartOutRaw = 0 ; FromString( ExtractInfo( m_Params.m_sUserNotes, "OutRaw="), nStartOutRaw) ; m_bStartOutRaw = (( nStartOutRaw & 1) != 0) ; m_bEndOutRaw = (( nStartOutRaw & 2) != 0) ; diff --git a/Pocketing.cpp b/Pocketing.cpp index 0728b88..545f8f1 100644 --- a/Pocketing.cpp +++ b/Pocketing.cpp @@ -1682,6 +1682,7 @@ Pocketing::ProcessPath( int nPathId, int nPvId, int nClId) m_bOpenOutRaw = ( FromString( ExtractInfo( m_Params.m_sUserNotes, "OpenOutRaw="), nOpenOutRaw) && nOpenOutRaw != 0) ; // recupero eventuale minima lunghezza di attacco su lato aperto + m_dOpenMinSafe = 0 ; FromString( ExtractInfo( m_Params.m_sUserNotes, "OpenMinSafe="), m_dOpenMinSafe) ; // se richiesta anteprima diff --git a/PocketingNT.cpp b/PocketingNT.cpp index e6a2669..c274699 100644 --- a/PocketingNT.cpp +++ b/PocketingNT.cpp @@ -2171,6 +2171,7 @@ PocketingNT::ProcessPath( int nPathId, int nPvId, int nClId) m_bOpenOutRaw = ( FromString( ExtractInfo( m_Params.m_sUserNotes, "OpenOutRaw="), nOpenOutRaw) && nOpenOutRaw != 0) ; // recupero eventuale minima lunghezza di attacco su lato aperto + m_dOpenMinSafe = 0 ; FromString( ExtractInfo( m_Params.m_sUserNotes, "OpenMinSafe="), m_dOpenMinSafe) ; // se richiesta anteprima diff --git a/Sawing.cpp b/Sawing.cpp index 3a7ee11..0807972 100644 --- a/Sawing.cpp +++ b/Sawing.cpp @@ -1868,10 +1868,10 @@ Sawing::ProcessLine( const ICurve* pCrvP, const ICurveLine* pLineC, const ICurve if ( ! sFsta.empty()) { string sLen, sPu ; SplitFirst( sFsta, ",", sLen, sPu) ; - FromString( sLen, FvVar.dLenStart) ; - FvVar.dLenStart = max( FvVar.dLenStart, 0.) ; - FromString( sPu, FvVar.dPuStart) ; - FvVar.dPuStart = max( FvVar.dPuStart, 0.) ; + if ( FromString( sLen, FvVar.dLenStart)) + FvVar.dLenStart = max( FvVar.dLenStart, 0.) ; + if ( FromString( sPu, FvVar.dPuStart)) + FvVar.dPuStart = max( FvVar.dPuStart, 0.) ; } } if ( pCrvN == nullptr) { @@ -1879,10 +1879,10 @@ Sawing::ProcessLine( const ICurve* pCrvP, const ICurveLine* pLineC, const ICurve if ( ! sFend.empty()) { string sLen, sPu ; SplitFirst( sFend, ",", sLen, sPu) ; - FromString( sLen, FvVar.dLenEnd) ; - FvVar.dLenEnd = max( FvVar.dLenEnd, 0.) ; - FromString( sPu, FvVar.dPuEnd) ; - FvVar.dPuEnd = max( FvVar.dPuEnd, 0.) ; + if ( FromString( sLen, FvVar.dLenEnd)) + FvVar.dLenEnd = max( FvVar.dLenEnd, 0.) ; + if ( FromString( sPu, FvVar.dPuEnd)) + FvVar.dPuEnd = max( FvVar.dPuEnd, 0.) ; } } diff --git a/SimulatorMP.cpp b/SimulatorMP.cpp index 50414a1..f69542a 100644 --- a/SimulatorMP.cpp +++ b/SimulatorMP.cpp @@ -2619,11 +2619,11 @@ SimulatorMP::ExecCmdData( int& nStatus) bOk = m_pMachine->LuaSetGlobVar( CmdCurr.sPar, bVal) ; } break ; case 2 : - { int nVal ; FromString( CmdCurr.sPar2, nVal) ; + { int nVal = 0 ; FromString( CmdCurr.sPar2, nVal) ; bOk = m_pMachine->LuaSetGlobVar( CmdCurr.sPar, nVal) ; } break ; case 3 : - { double dVal ; FromString( CmdCurr.sPar2, dVal) ; + { double dVal = 0 ; FromString( CmdCurr.sPar2, dVal) ; bOk = m_pMachine->LuaSetGlobVar( CmdCurr.sPar, dVal) ; } break ; case 4 :