From 781e2d527467655d173377206b664ae77c3e910a Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Thu, 27 Oct 2022 22:24:37 +0200
Subject: [PATCH] 3dPrinting : - piccole modifiche estetiche - salvataggio in
 TFS di MF e TotalArea.

---
 LuaLibs/AddManData.lua             | 6 ++++--
 LuaLibs/RunGcodeGenerate.lua       | 2 +-
 LuaLibs/RunMachParamFromSWCalc.lua | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/LuaLibs/AddManData.lua b/LuaLibs/AddManData.lua
index 8f3134b..41623da 100644
--- a/LuaLibs/AddManData.lua
+++ b/LuaLibs/AddManData.lua
@@ -39,12 +39,12 @@ KEY_PARAMS = "Params"
 KEY_CALC_SOLIDS = "CalcSolids"
 KEY_SPIRAL_VASE = "SpiralVase"
 KEY_SLICING_TYPE = "SlicingType"
-KEY_SLICING_DIR="SlicingDir"
+KEY_SLICING_DIR = "SlicingDir"
 KEY_SLICE_STEP = "StrandH"
 KEY_SHELLS_NBR = "StrandCount"
 KEY_STRAND = "StrandW"
 KEY_STRAND_OVERLAP = "StrandOverlap"
-KEY_OFFSET_SLICE ="Offset"
+KEY_OFFSET_SLICE = "Offset"
 KEY_SP_OFFSET_ON_SLICE = "StartPointOffsetOnSlice"
 KEY_PRINT_ORDER = "StrandOrder"
 KEY_PRINT_DIRECTION = "Direction"
@@ -272,6 +272,8 @@ KEY_FCUR = "FCur"
 KEY_LENGTH = "Length"
 KEY_SLICEID = "SliceId"
 KEY_MASS = "PrintMass"
+KEY_MF = "MF"
+KEY_TOTAREA = "TotArea"
 
 ---------------------------------------------------------------------
 return AddManData
diff --git a/LuaLibs/RunGcodeGenerate.lua b/LuaLibs/RunGcodeGenerate.lua
index 6d3ead1..2258340 100644
--- a/LuaLibs/RunGcodeGenerate.lua
+++ b/LuaLibs/RunGcodeGenerate.lua
@@ -128,7 +128,7 @@ function RunGcodeGenerate.Exec()
    EgtProcessEvents( 680, 0)
 
    -- Genero il programma CN
-   local sInfo = 'EgtCAM5 ver.' .. EgtGetExeVersion() .. ' - ' .. sPath
+   local sInfo = 'Icarus ver.' .. EgtGetExeVersion() .. ' - ' .. sPath
    local sISOFilePath = ''
    if PRINT and PRINT.PROGRAM == 1 and PRINT.ISOFILEPATH then
       sISOFilePath = PRINT.ISOFILEPATH
diff --git a/LuaLibs/RunMachParamFromSWCalc.lua b/LuaLibs/RunMachParamFromSWCalc.lua
index 837e76d..15c2b6c 100644
--- a/LuaLibs/RunMachParamFromSWCalc.lua
+++ b/LuaLibs/RunMachParamFromSWCalc.lua
@@ -177,6 +177,8 @@ function RunMachParamFromSWCalc.Exec()
          EgtSetInfo( nLayerResultId, KEY_FCUR, dLayerFeed)
          EgtSetInfo( nLayerResultId, KEY_LENGTH, dTotLayerLength)
          EgtSetInfo( nLayerResultId, KEY_SPEED, dSpeed)
+         EgtSetInfo( nLayerResultId, KEY_MF, dMF)
+         EgtSetInfo( nLayerResultId, KEY_TOTAREA, dTotLayerArea)
          -- aggiorno interfaccia
          EgtProcessEvents( 500 + ( nLayerIndex / nLayerQty * 100), 0)
          nLayerIndex = nLayerIndex + 1