Egalware/DataWall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DataWall :

Browse Source 
- migliorie per nesting
- correzione scelta testa per fori orizzontali ciechi
- posizionamento pezzi in Vista secondo angolo preferenziale di nesting.
This commit is contained in:
DarioS
2022-01-05 20:47:31 +01:00
parent a471125fda
commit f5fdb7d89e
4 changed files with 356 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LuaLibs/WProcessDrill.lua
+1 -1
View File
@@ -257,7 +257,7 @@ function WPD.Make( Proc, nRawId, b3Raw)
if dDiam < 200 then
if WD.HOR_DRILL_Y_SPLIT and AreSameOrOppositeVectorApprox( vtExtr, Y_AX()) then
local dExtrY = vtExtr:getY()
if abs( Proc.Flg) == 2 then
if not bOpen or abs( Proc.Flg) == 2 then
sHead = EgtIf( dExtrY > 0, 'H5', 'H6')
else
if Proc.Box:getMax():getY() > WD.HOR_DRILL_Y_SPLIT + 10 then
LuaLibs/WallExec.lua
+12 -3
View File
@@ -48,7 +48,7 @@ local Variant = require( 'WProcessVariant')
-------------------------------------------------------------------------------------------------------------
-- *** Inserimento delle pareti nel pannello ***
-------------------------------------------------------------------------------------------------------------
function WallExec.ProcessWalls( dRawL, dRawW, dRawH, vWall, bMachGroupOk, bPartOriBL)
function WallExec.ProcessWalls( dRawL, dRawW, dRawH, vWall, bMachGroupOk, bNewProcess)
-- Creazione nuovo gruppo di lavoro
if not bMachGroupOk then
@@ -117,8 +117,17 @@ function WallExec.ProcessWalls( dRawL, dRawW, dRawH, vWall, bMachGroupOk, bPartO
-- inserisco il pezzo nel grezzo
EgtDeselectPartObjs( Pz)
local ptPos
if bPartOriBL then
ptPos = Point3d( vWall[i].PosX, vWall[i].PosZ, ( dRawH - PartHeight) / 2) + vtOffs
if bNewProcess then
local sNestingRef = ( WALL.NESTING_REF or WD.NESTING_CORNER)
if sNestingRef == 'TL' then
ptPos = Point3d( vWall[i].PosX, dRawW - PartWidth - vWall[i].PosZ, ( dRawH - PartHeight) / 2) + vtOffs
elseif sNestingRef == 'TR' then
ptPos = Point3d( dRawL - PartLen - vWall[i].PosX, dRawW - PartWidth - vWall[i].PosZ, ( dRawH - PartHeight) / 2) + vtOffs
elseif sNestingRef == 'BR' then
ptPos = Point3d( dRawL - PartLen - vWall[i].PosX, vWall[i].PosZ, ( dRawH - PartHeight) / 2) + vtOffs
else -- 'BL'
ptPos = Point3d( vWall[i].PosX, vWall[i].PosZ, ( dRawH - PartHeight) / 2) + vtOffs
end
else
local dPosH = EgtIf( vWall[i].PosY < 0.1, ( dRawH - PartHeight) / 2, vWall[i].PosY)
ptPos = Point3d( dRawL - vWall[i].PosX - PartLen, vWall[i].PosZ, dPosH) + vtOffs