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

EgtMachKernel :

Browse Source 
- aggiustamenti per modifiche a FromString (in caso di errore non inizializza più a 0 il valore di ritorno)
This commit is contained in:
Dario Sassi
2025-01-06 18:18:00 +01:00
parent cb20faa0cc
commit 7d7e3209c0
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtMachKernel.sln
+2 -2
View File
@@ -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
Milling.cpp
+1 -1
View File
@@ -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) ;
Pocketing.cpp
+1
View File
@@ -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
PocketingNT.cpp
+1
View File
@@ -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
Sawing.cpp
+8 -8
View File
@@ -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.) ;
}
}
SimulatorMP.cpp
+2 -2
View File
@@ -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 :