DataWall :

- sistemazione varie per macchina NZ.
This commit is contained in:
DarioS
2021-04-29 09:02:35 +02:00
parent 1a658822fe
commit 903638adea
7 changed files with 77 additions and 12 deletions
+20
View File
@@ -20,6 +20,8 @@ local WD = require( 'WallData')
_G.package.loaded.WMachiningLib = nil
_G.package.loaded.WallLib = nil
_G.package.loaded.WProcessCut = nil
_G.package.loaded.WProcessDoubleCut = nil
_G.package.loaded.WProcessSawCut = nil
_G.package.loaded.WProcessLapJoint = nil
_G.package.loaded.WProcessDrill = nil
_G.package.loaded.WProcessMortise = nil
@@ -30,6 +32,8 @@ _G.package.loaded.WProcessFreeContour = nil
local WM = require( 'WMachiningLib')
local WL = require( 'WallLib')
local Cut = require( 'WProcessCut')
local DoubleCut = require( 'WProcessDoubleCut')
local SawCut = require( 'WProcessSawCut')
local LapJoint = require( 'WProcessLapJoint')
local Drill = require( 'WProcessDrill')
local Mortise = require( 'WProcessMortise')
@@ -168,6 +172,14 @@ local function ClassifyFeatures( vProc, b3Raw)
if Cut.Identify( Proc) then
local bOk = Cut.Classify( Proc, b3Raw)
if not bOk then Proc.Flg = 0 end
-- se taglio doppio
elseif DoubleCut.Identify( Proc) then
local bOk = DoubleCut.Classify( Proc, b3Raw)
if not bOk then Proc.Flg = 0 end
-- se taglio con lama
elseif SawCut.Identify( Proc) then
local bOk = SawCut.Classify( Proc, b3Raw)
if not bOk then Proc.Flg = 0 end
-- se tasca
elseif LapJoint.Identify( Proc) then
local bOk = LapJoint.Classify( Proc, b3Raw)
@@ -221,6 +233,14 @@ local function AddFeatureMachining( Proc, nRawId, b3Raw)
if Cut.Identify( Proc) then
-- esecuzione taglio
bOk, sErr = Cut.Make( Proc, nRawId, b3Raw)
-- se taglio doppio (1/2-011-X) o taglio doppio longitudinale (0-012-X)
elseif DoubleCut.Identify( Proc) then
-- esecuzione taglio
bOk, sErr = DoubleCut.Make( Proc, nRawId, b3Raw)
-- se taglio con lama (0/3/4-013-X)
elseif SawCut.Identify( Proc) then
-- esecuzione taglio
bOk, sErr = SawCut.Make( Proc, nRawId, b3Raw)
-- se tasca (3/4-030-X) o similari
elseif LapJoint.Identify( Proc) then
-- esecuzione tasca