diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index e3165a0..8df702e 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ 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 ; }