diff --git a/LuaLibs/CalcSlices.lua b/LuaLibs/CalcSlices.lua index cc2b76a..1ef79d2 100644 --- a/LuaLibs/CalcSlices.lua +++ b/LuaLibs/CalcSlices.lua @@ -20,7 +20,7 @@ local function GetSliceStep() end --------------------------------------------------------------------- -function CalcSlices.Exec( nPartId, nStmId) +function CalcSlices.Exec( nPartId, nStmId, HMax) local dTol = 0.1 @@ -35,6 +35,7 @@ function CalcSlices.Exec( nPartId, nStmId) -- Parametri di slicing local dZmin = b3Box:getMin():getZ() local dZmax = b3Box:getMax():getZ() + dZmax = min( dZmax, dZmin + HMax) --dZmin = 1030 --dZmax = 1031 @@ -130,9 +131,9 @@ function CalcSlices.Exec( nPartId, nStmId) EgtApproxCurve( nNewId + nPntCnt + nInd, GDB_CA.ARCS, dTol) end local nSurfFR = EgtSurfFlatRegion( nLayId, vCrvs) - --for nInd = 1, #vCrvs do - -- EgtErase( vCrvs[nInd]) - --end + for nInd = 1, #vCrvs do + EgtErase( vCrvs[nInd]) + end if nSurfFR then -- analizzo i singoli chunks diff --git a/LuaLibs/RunGcodeGenerate.lua b/LuaLibs/RunGcodeGenerate.lua index e636e13..72ad585 100644 --- a/LuaLibs/RunGcodeGenerate.lua +++ b/LuaLibs/RunGcodeGenerate.lua @@ -71,7 +71,7 @@ function RunGcodeGenerate.Exec() -- Aggiungo la lavorazione EgtSetCurrMachGroup() - local nMchId = EgtAddMachining( 'Extrusion 1', 'ExtrusionA') + local nMchId = EgtAddMachining( 'Extrusion 1', 'Extrusion') if not nMchId then EgtOutBox( 'Error adding Extrusion', 'GcodeGenerate') return diff --git a/LuaLibs/RunMachiningParamCalc.lua b/LuaLibs/RunMachiningParamCalc.lua index 498734f..2dcdc6a 100644 --- a/LuaLibs/RunMachiningParamCalc.lua +++ b/LuaLibs/RunMachiningParamCalc.lua @@ -26,9 +26,10 @@ function RunMachiningParamCalc.Exec() local dStrand = EgtGetInfo( nParamsGrp, KEY_STRAND, 'd') local sMaterial = EgtGetInfo( nParamsGrp, KEY_MATERIAL) - local sMachiningPath = EgtGetStringFromIni( '3dPrinting', 'ParamFile', "", EgtGetIniFile()) - local dCoeffX = tonumber( EgtGetStringFromIni( DEFAULT_SECTION, KEY_COEFF_X, 0, sMachiningPath)) - local dCoeffY = tonumber( EgtGetStringFromIni( DEFAULT_SECTION, KEY_COEFF_Y, 0, sMachiningPath)) + local sMachIni = EgtGetCurrMachineDir() .. '\\' .. EgtGetCurrMachineName() .. '.ini' + local dCoeffX = tonumber( EgtGetStringFromIni( '3dPrinting', 'CoeffX', 0, sMachIni)) + local dCoeffY = tonumber( EgtGetStringFromIni( '3dPrinting', 'CoeffY', 0, sMachIni)) + local sCalcBaseDir = EgtGetStringFromIni( '3dPrinting', 'BaseDir', 'C:\\ProgramData\\Egaltech\\EgtCam5\\3dPrinting', EgtGetIniFile()) local sCurrProjectPath = EgtGetCurrFilePath() local sResultFile = EgtChangePathExtension( sCurrProjectPath, '.csv') diff --git a/LuaLibs/RunPartPositioning.lua b/LuaLibs/RunPartPositioning.lua index 3faf875..9cd6adb 100644 --- a/LuaLibs/RunPartPositioning.lua +++ b/LuaLibs/RunPartPositioning.lua @@ -1,4 +1,4 @@ --- RunPartPositioning.lua by Egaltech s.r.l. 2022/04/11 +-- RunPartPositioning.lua by Egaltech s.r.l. 2022/04/13 -- Gestione calcolo disposizione e lavorazioni per stampa 3d -- 2022/03/21 Creazione file @@ -79,7 +79,7 @@ function RunPartPositioning.Exec() EgtSetName( nTabOutlineId, TABLE_OUTLINE) local nTabSurfId = EgtSurfFlatRegion( nTabLayer, nTabOutlineId) EgtSetName( nTabSurfId, TABLE_SURFACE) - EgtSetColor( nTabSurfId, 'ORANGE') + EgtSetColor( nTabSurfId, 'GRAY') EgtSetAlpha( nTabSurfId, 70) end diff --git a/LuaLibs/RunSlicing.lua b/LuaLibs/RunSlicing.lua index e1b6de9..c39d4eb 100644 --- a/LuaLibs/RunSlicing.lua +++ b/LuaLibs/RunSlicing.lua @@ -61,7 +61,7 @@ local function LoadParams( sFile, nPartId) local sStrandDirection = EgtGetStringFromIni( DEFAULT_SECTION, KEY_PRINT_DIRECTION, 'CCW', sFile) if sStrandDirection == 'CW' then EgtSetInfo( nParamsGrp, KEY_PRINT_DIRECTION, PRINT_DIRECTION.CW) - else -- CCW + else -- 'CCW' EgtSetInfo( nParamsGrp, KEY_PRINT_DIRECTION, PRINT_DIRECTION.CCW) end @@ -87,16 +87,16 @@ local function LoadParams( sFile, nPartId) SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_G0_FEED, '0.0') SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_MATERIAL, '') - local sLeadInType = EgtGetStringFromIni( DEFAULT_SECTION, KEY_LEAD_IN_TYPE, 'arc', sFile) - if sLeadInType == 'linear' then + local sLeadInType = EgtGetStringFromIni( DEFAULT_SECTION, KEY_LEAD_IN_TYPE, 'Arc', sFile) + if sLeadInType == 'Linear' then EgtSetInfo( nParamsGrp, KEY_LEAD_IN_TYPE, LEAD_TYPE.LINEAR) else EgtSetInfo( nParamsGrp, KEY_LEAD_IN_TYPE, LEAD_TYPE.ARC) end SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_LEAD_IN_TANG_DIST, '0.0') SetParamInfo( sFile, nParamsGrp, DEFAULT_SECTION, KEY_LEAD_IN_ORTHO_DIST, '0.0') - local sLeadOutType = EgtGetStringFromIni( DEFAULT_SECTION, KEY_LEAD_OUT_TYPE, 'arc', sFile) - if sLeadOutType == 'linear' then + local sLeadOutType = EgtGetStringFromIni( DEFAULT_SECTION, KEY_LEAD_OUT_TYPE, 'Arc', sFile) + if sLeadOutType == 'Linear' then EgtSetInfo( nParamsGrp, KEY_LEAD_OUT_TYPE, LEAD_TYPE.LINEAR) else EgtSetInfo( nParamsGrp, KEY_LEAD_OUT_TYPE, LEAD_TYPE.ARC) @@ -147,8 +147,12 @@ function RunSlicing.Exec() -- Lettura dei parametri LoadParams( sParamFile, nPartId) + -- Lettura dati macchina + local sMachIni = EgtGetCurrMachineDir() .. '\\' .. EgtGetCurrMachineName() .. '.ini' + local HMax = tonumber( EgtGetStringFromIni( '3dPrinting', 'HMax', 500, sMachIni)) + -- Calcolo delle fette - CSLICES.Exec( nPartId, nStmId) + CSLICES.Exec( nPartId, nStmId, HMax) EgtDraw() -- Calcolo dei percorsi sul centro strand in basso diff --git a/Machinings/Params.ini b/Machinings/Params.ini index fb30ecc..b4f0c56 100644 --- a/Machinings/Params.ini +++ b/Machinings/Params.ini @@ -9,6 +9,7 @@ Direction=CCW LinkType=sPath LinkParam=10.0 LinkDist=0 +LinkZup=10.0 OffsetLeadPoint=10 LeadIn=arc LeadInTangDist=20 @@ -21,5 +22,4 @@ Speed= Feed=4500 G0Feed=10000 Material=B461 -CoeffX=-8.68 -CoeffY=12.4865 + diff --git a/Machinings/Params3.ini b/Machinings/Params3.ini deleted file mode 100644 index 185f0ee..0000000 --- a/Machinings/Params3.ini +++ /dev/null @@ -1,37 +0,0 @@ -[Default] -StrandH=40.0 -StrandW=6.0 -StrandCount=3 -Offset=2.0 -StartingPoint=0,-300 -StrandOrder=in -Direction=CCW -LinkType=sPath -LinkParam=10.0 -FloorCount=2 -Speed= -Feed=4500 -G0Feed=10000 -Material=B461 -CoeffX=-8.68 -CoeffY=12.4865 - -[LayerX] -StrandH=1 -StrandW=8 -StrandCount=3 -Offset=2 -StartingPoint=(x,y) -StrandOrder=in/out -Direction=CW/CCW -LinkType=straight/sPath -LinkParam=5 -FloorCount=2 -Speed= -ExtFeed= -IntFeed= -InfillFeed= -LeadInFeed= -LeadOutFeed= -SupportFeed= -G0Feed= diff --git a/Materials/B461.csv b/Materials/B461.csv index 116186b..134bfb2 100644 --- a/Materials/B461.csv +++ b/Materials/B461.csv @@ -1,26 +1,27 @@ Larghezza strand W [mm];Passo Z [mm];Tempo minimo [sec] ;Tempo massimo [sec] -1;"1";"10";"25" -2;"1";"14";"28" -3;"1";"16";"30" -4;"1";"18";"40" -5;"1";"20";"50" -6;"1";"25";"52" -7;"1";"30";"55" -8;"1";"32";"60" -9;"1";"36";"65" -10;"1";"38";"70" -11;"1";"40";"75" -12;"1";"44";"80" -1;"1.2";"11";"26" -2;"1.2";"15";"29" -3;"1.2";"17";"31" -4;"1.2";"19";"41" -5;"1.2";"21";"51" -6;"1.2";"26";"53" -7;"1.2";"31";"56" -8;"1.2";"33";"61" -9;"1.2";"37";"66" -10;"1.2";"39";"71" -11;"1.2";"41";"76" -12;"1.2";"45";"81" -6;"2";"60";"100" \ No newline at end of file +1;1;10;25 +2;1;14;28 +3;1;16;30 +4;1;18;40 +5;1;20;50 +6;1;25;52 +7;1;30;55 +8;1;32;60 +9;1;36;65 +10;1;38;70 +11;1;40;75 +12;1;44;80 +1;1.2;11;26 +2;1.2;15;29 +3;1.2;17;31 +4;1.2;19;41 +5;1.2;21;51 +6;1.2;26;53 +7;1.2;31;56 +8;1.2;33;61 +9;1.2;37;66 +10;1.2;39;71 +11;1.2;41;76 +12;1.2;45;81 +6;2;60;100 +18;5;90;150