diff --git a/LuaLibs/AddManData.lua b/LuaLibs/AddManData.lua index 6e8896f..40f31ef 100644 --- a/LuaLibs/AddManData.lua +++ b/LuaLibs/AddManData.lua @@ -48,8 +48,8 @@ KEY_SPIRAL_VASE = "SpiralVase" KEY_SPIRAL_VASE_LEN = 'SpiralVaseLen' KEY_SPIRAL_VASE_INTERP_LEN = 'SpiralVaseInterpLen' KEY_SLICING_TYPE = "SlicingType" -KEY_SLICING_DIR = "SlicingDir" -KEY_SLICING_POS = "SlicingPos" +KEY_SLICE_DIR = "SliceDir" +KEY_SLICE_POS = "SlicePos" KEY_SLICE_STEP = "StrandH" KEY_SHELLS_NBR = "StrandCount" KEY_STRAND = "StrandW" diff --git a/LuaLibs/CalcPaths.lua b/LuaLibs/CalcPaths.lua index 14d2a85..606ba22 100644 --- a/LuaLibs/CalcPaths.lua +++ b/LuaLibs/CalcPaths.lua @@ -31,7 +31,7 @@ local function GetLayerParamsForPathCalc() LayerParams.dLayHeight = EgtGetInfo( s_nPartId, KEY_SLICE_STEP, 'd') LayerParams.dStrandOverlap = EgtGetInfo( s_nPartId, KEY_STRAND_OVERLAP, 'd') or 0 LayerParams.dOffs = EgtGetInfo( s_nPartId, KEY_OFFSET_SLICE, 'd') - s_vtSlicing = EgtGetInfo( s_nPartId, KEY_SLICING_DIR, 'v') + s_vtSlicing = EgtGetInfo( s_nPartId, KEY_SLICE_DIR, 'v') LayerParams.bPrintInvert = ( EgtGetInfo( s_nPartId, KEY_PRINT_DIRECTION, 'i') == PRINT_DIRECTION.CW) LayerParams.vPrintOrder = EgtGetInfo( s_nPartId, KEY_PRINT_ORDER, 'vi') or { 1, 2, 3, 4, 5, 6, 7, 8} -- parametri costolature @@ -4351,7 +4351,7 @@ function CalcPaths.Exec( nPartId) s_nCurrIdx = nIdx if nSlicingType == SLICING_TYPE.MULTIPLANAR then - s_vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICING_DIR, 'v') + s_vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICE_DIR, 'v') end local nRibsGrp = EgtGetFirstNameInGroup( vLayIds[nIdx], RIBS_GRP) diff --git a/LuaLibs/CalcSlices.lua b/LuaLibs/CalcSlices.lua index ca9c63d..605ae87 100644 --- a/LuaLibs/CalcSlices.lua +++ b/LuaLibs/CalcSlices.lua @@ -806,8 +806,8 @@ local function MultiPlanarSlicing( nStmId) nFirstGrpId = nGrpId end local nEntId = EgtPlaneSurfTmInters( ptOn, vtN, nStmId, nGrpId, GDB_RT.GLOB, TOLER) - EgtSetInfo( nGrpId, KEY_SLICING_DIR, vtN) - EgtSetInfo( nGrpId, KEY_SLICING_POS, ptOn) + EgtSetInfo( nGrpId, KEY_SLICE_DIR, vtN) + EgtSetInfo( nGrpId, KEY_SLICE_POS, ptOn) end return nFirstGrpId end @@ -844,7 +844,7 @@ local function SlicingWithSolid( nStmId, vZSlices, dDeltaZStart, dZmin, frSlicin EgtSetInfo( nLayId, KEY_SLICE_NBR, nLayCnt) if nSlicingType == SLICING_TYPE.MULTIPLANAR then - vtSlicing = EgtGetInfo( nLayId, KEY_SLICING_DIR, 'v') + vtSlicing = EgtGetInfo( nLayId, KEY_SLICE_DIR, 'v') end -- verifico se necessario ricalcolo @@ -1154,7 +1154,7 @@ function CalcSlices.Exec( nPartId, nStmId) vtSlicing = Z_AX() end - EgtSetInfo( s_nPartId, KEY_SLICING_DIR, vtSlicing) + EgtSetInfo( s_nPartId, KEY_SLICE_DIR, vtSlicing) local frSlicing = Frame3d( ORIG(), vtSlicing) -- recupero la superficie ed eventuali setti esterni/unbounded da usare come riferimenti per quote slicing diff --git a/LuaLibs/CalcToolPath.lua b/LuaLibs/CalcToolPath.lua index d92a606..83ca22c 100644 --- a/LuaLibs/CalcToolPath.lua +++ b/LuaLibs/CalcToolPath.lua @@ -46,7 +46,7 @@ local function GetLayerParamsForToolPathCalc() LayerParams.dCoastingLen = EgtGetInfo( s_nPartId, KEY_COASTING_LEN, 'd') LayerParams.dWipeLen = EgtGetInfo( s_nPartId, KEY_WIPE_LEN, 'd') LayerParams.dWipeDir = EgtGetInfo( s_nPartId, KEY_WIPE_DIR, 'd') or 0.0 - LayerParams.vtSlicing = EgtGetInfo( s_nPartId, KEY_SLICING_DIR, 'v') + LayerParams.vtSlicing = EgtGetInfo( s_nPartId, KEY_SLICE_DIR, 'v') LayerParams.dTDiam = EgtGetInfo( s_nPartId, KEY_TOOL_DIAM, 'd') -- parametri infill LayerParams.dInfillStrand = EgtGetInfo( s_nPartId, KEY_INFILL_STRAND, 'd') or LayerParams.dStrand @@ -2047,7 +2047,7 @@ local function SpiralVaseFull( vLayIds, LayerParams) for nIdx = 1, #vLayIds do if nSlicingType == SLICING_TYPE.MULTIPLANAR then - LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICING_DIR, 'v') + LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICE_DIR, 'v') end -- cerco i gruppi di contorni @@ -2270,7 +2270,7 @@ local function SpiralVasePartial( vLayIds, LayerParams) for nIdx = 1, #vLayIds do if nSlicingType == SLICING_TYPE.MULTIPLANAR then - LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICING_DIR, 'v') + LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICE_DIR, 'v') end -- cerco i gruppi di contorni @@ -2473,7 +2473,7 @@ function CalcToolPath.Exec( nPartId) s_nCurrIdx = nIdx if nSlicingType == SLICING_TYPE.MULTIPLANAR then - LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICING_DIR, 'v') + LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICE_DIR, 'v') end -- scorro tutti i gruppi di contorni diff --git a/LuaLibs/RunCalcSolids.lua b/LuaLibs/RunCalcSolids.lua index 9165ea5..e3e55ff 100644 --- a/LuaLibs/RunCalcSolids.lua +++ b/LuaLibs/RunCalcSolids.lua @@ -21,7 +21,7 @@ local function GetLayerParamsForSolidCalc( nPartId) local LayerParams = {} LayerParams.bSpiralVase = EgtGetInfo( nPartId, KEY_SPIRAL_VASE, 'b') or false LayerParams.dLayHeight = EgtGetInfo( nPartId, KEY_SLICE_STEP, 'd') - LayerParams.vtSlicing = EgtGetInfo( nPartId, KEY_SLICING_DIR, 'v') + LayerParams.vtSlicing = EgtGetInfo( nPartId, KEY_SLICE_DIR, 'v') LayerParams.dStrand = EgtGetInfo( nPartId, KEY_STRAND, 'd') return LayerParams end @@ -418,7 +418,7 @@ function RunCalcSolids.Exec() for nIdx = 1, #vLayIds do if nSlicingType == SLICING_TYPE.MULTIPLANAR then - LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICING_DIR, 'v') + LayerParams.vtSlicing = EgtGetInfo( vLayIds[nIdx], KEY_SLICE_DIR, 'v') end -- flag di interruzione perchè trovati solidi già ok diff --git a/LuaLibs/RunPrepareExport.lua b/LuaLibs/RunPrepareExport.lua index 5b28166..014598e 100644 --- a/LuaLibs/RunPrepareExport.lua +++ b/LuaLibs/RunPrepareExport.lua @@ -156,8 +156,8 @@ function RunPrepareExport.Exec() -- recupero alcune info utili e le assegno al punto per poterle leggere da ThreeJS local dH = EgtGetInfo( nPartId, KEY_SLICE_STEP, 'd') EgtSetInfo( nPnt, KEY_SLICE_STEP, dH) - local vtSlicing = EgtGetInfo( nPartId, KEY_SLICING_DIR, 'v') - EgtSetInfo( nPnt, KEY_SLICING_DIR, vtSlicing) + local vtSlicing = EgtGetInfo( nPartId, KEY_SLICE_DIR, 'v') + EgtSetInfo( nPnt, "SlicingDir", vtSlicing) local bSpiralVase = EgtGetInfo( nPartId, KEY_SPIRAL_VASE, 'b') or false EgtSetInfo( nPnt, KEY_SPIRAL_VASE, bSpiralVase)