From bdb7234fbb5dd33ee91c78d9717432efb569a87b Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Wed, 9 Feb 2022 09:50:28 +0100
Subject: [PATCH] EgtMachKernel 2.4b2 : - corretto salvataggio lavorazioni con
 nuovi parametri opzionali da non salvare se coincidono con default.

---
 EgtMachKernel.rc  | Bin 11774 -> 11774 bytes
 MachiningsMgr.cpp |  14 ++++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index e3165a04477141521131d92525f5223ccedd1f27..8df702ef652dfe2654a9221e3258ade4834185ce 100644
GIT binary patch
delta 236
zcmewt{V#gMI%aKGhCGIJh8%`WhGK>c1_cHUhESkLCPN8BDnkm89}HwAf_cT0IklxX
ze_&=~W;ELTUhX2(<P)4ZK&GKoDdXl<+#V2NM-XMG1QHU43L&Z7%L3L5Rg_Jt^#><&
nF)y2}rOv|(a;PWRX*mp)Acsx<z?`-DjJggps?=sq?XOG#vj{!|

delta 241
zcmewt{V#gMI%aiGhCGIJh8%`ehGHOAV9;O)W+-7u1ma8}FBB-731Uz7R&U)L$1;bB
z(Qxx`Hd|&!!^saNbvLJRO<)0wTx6PjLa+cPDg+fpQs=?Ad6l#WP#;h`nqrWY@;63e
oowE6~YB8f=KG?0EV7KM~-I%!9TYV!lrtsv`ss}fp(l%iN08+|C82|tP

diff --git a/MachiningsMgr.cpp b/MachiningsMgr.cpp
index e0c746b..56e918b 100644
--- a/MachiningsMgr.cpp
+++ b/MachiningsMgr.cpp
@@ -512,14 +512,20 @@ MachiningsMgr::SaveOneMachining( const EgtUUID& Uuid, int& nCounter, Writer& The
    if ( iIter == m_umData.end())
       return false ;
    const MachiningData* pmData = iIter->second ;
+  // preparo la lista dei dati (quelli vuoti sono opzionali con default)
+   STRVECTOR vsOut ;
+   for ( int i = 0 ; i < pmData->GetSize() ; ++ i) {
+      string sOut = pmData->ToString( i) ;
+      if ( ! sOut.empty())
+         vsOut.emplace_back( sOut) ;
+   }
   // scrivo i dati della lavorazione
    string sOut = "[" + pmData->GetTitle() + "_" + ToString( ++ nCounter, 3) + "]" ;
    bool bOk = TheWriter.OutText( sOut) ;
-   sOut = MF_SIZE + "=" + ToString( pmData->GetSize()) ;
+   sOut = MF_SIZE + "=" + ToString( int( vsOut.size())) ;
    bOk = bOk && TheWriter.OutText( sOut) ;
-   for ( int i = 0 ; i < pmData->GetSize() ; ++ i) {
-      string sOut = pmData->ToString( i) ;
-      bOk = bOk && ! sOut.empty() && TheWriter.OutText( sOut) ;
+   for ( const auto& sOut : vsOut) {
+      bOk = bOk && TheWriter.OutText( sOut) ;
    }
    return bOk ;
 }