Compare commits

...

1 Commits

+21 -7
View File
@@ -25,12 +25,14 @@ EgtOutLog( ' MachiningLib started', 1)
-- Dati -- Dati
local BD = require( 'BeamData') local BD = require( 'BeamData')
local Cuttings = require( 'CutData') -- librerie lavorazioni caricate con pcall perchè potrebbero non esserci
local Millings = require( 'MillingData') local Cuttings, Millings, Pocketings, Sawings, Drillings, Probing
local Pocketings = require( 'PocketingData') if pcall( require, 'CutData') then Cuttings = require( 'CutData') end
local Sawings = require( 'SawingData') if pcall( require, 'MillingData') then Millings = require( 'MillingData') end
local Drillings = require( 'DrillData') if pcall( require, 'PocketingData') then Pocketings = require( 'PocketingData') end
local Probing = require( 'ProbingData') if pcall( require, 'SawingData') then Sawings = require( 'SawingData') end
if pcall( require, 'DrillData') then Drillings = require( 'DrillData') end
if pcall( require, 'ProbingData') then Probing = require( 'ProbingData') end
-- tipo di teste macchina -- tipo di teste macchina
local ONE_HEAD = 1 -- una testa (Fast, One, Turn1T) local ONE_HEAD = 1 -- una testa (Fast, One, Turn1T)
@@ -185,21 +187,33 @@ end
--------------------------------------------------------------------- ---------------------------------------------------------------------
function GetMachinings( MachiningType, sType) function GetMachinings( MachiningType, sType)
local Machinings local Machinings = {}
-- leggo le lavorazioni disponibili -- leggo le lavorazioni disponibili
if MachiningType == MCH_MY.DRILLING then if MachiningType == MCH_MY.DRILLING then
if Drillings and type( Drillings) == "table" then
Machinings = Drillings Machinings = Drillings
end
elseif MachiningType == MCH_MY.SAWING then elseif MachiningType == MCH_MY.SAWING then
if Cuttings and type( Cuttings) == "table" then
Machinings = Cuttings Machinings = Cuttings
end
elseif MachiningType == MCH_MY.MILLING then elseif MachiningType == MCH_MY.MILLING then
if Millings and type( Millings) == "table" then
Machinings = Millings Machinings = Millings
end
elseif MachiningType == MCH_MY.POCKETING then elseif MachiningType == MCH_MY.POCKETING then
if Pocketings and type( Pocketings) == "table" then
Machinings = Pocketings Machinings = Pocketings
end
elseif MachiningType == MCH_MY.MORTISING then elseif MachiningType == MCH_MY.MORTISING then
if Sawings and type( Sawings) == "table" then
Machinings = Sawings Machinings = Sawings
end
elseif MachiningType == MCH_MY.PROBING then elseif MachiningType == MCH_MY.PROBING then
if Probing and type( Probing) == "table" then
Machinings = Probing Machinings = Probing
end end
end
-- scrivo i parametri utensile nella lavorazione -- scrivo i parametri utensile nella lavorazione
local validMachinings = {} local validMachinings = {}
for i = 1, #Machinings do for i = 1, #Machinings do