complete drilling UI?
This commit is contained in:
parent
c91c5a6fa4
commit
76eccc5dab
3 changed files with 25 additions and 2 deletions
|
|
@ -1583,7 +1583,8 @@ CAM.init = function(kiri, api) {
|
||||||
rate: 'camDrillDownSpeed',
|
rate: 'camDrillDownSpeed',
|
||||||
dwell: 'camDrillDwell',
|
dwell: 'camDrillDwell',
|
||||||
lift: 'camDrillLift',
|
lift: 'camDrillLift',
|
||||||
mark: 'camDrillMark'
|
mark: 'camDrillMark',
|
||||||
|
thru: 'camDrillThru',
|
||||||
}).inputs = {
|
}).inputs = {
|
||||||
tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
|
tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
|
||||||
sep: UC.newBlank({class:"pop-sep"}),
|
sep: UC.newBlank({class:"pop-sep"}),
|
||||||
|
|
@ -1593,6 +1594,13 @@ CAM.init = function(kiri, api) {
|
||||||
dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat}),
|
dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat}),
|
||||||
lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => !poppedRec.mark}),
|
lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => !poppedRec.mark}),
|
||||||
mark: UC.newBoolean(LANG.cd_mark_s, undefined, {title:LANG.cd_mark_l}),
|
mark: UC.newBoolean(LANG.cd_mark_s, undefined, {title:LANG.cd_mark_l}),
|
||||||
|
sep: UC.newBlank({class:"pop-sep"}),
|
||||||
|
thru: UC.newInput(LANG.cd_drlthru_s, {title:LANG.cd_drlthru_l, convert:UC.toFloat, units:true}),
|
||||||
|
sep: UC.newBlank({class:"pop-sep"}),
|
||||||
|
actions: UC.newRow([
|
||||||
|
UC.newButton(LANG.cd_select_s, func.selectIndividual, {title:LANG.cd_select_l}),
|
||||||
|
UC.newButton(LANG.cd_selall_s, func.selectAll, {title:LANG.cd_selall_l})
|
||||||
|
], {class:"ext-buttons f-row"})
|
||||||
};
|
};
|
||||||
|
|
||||||
createPopOp('register', {
|
createPopOp('register', {
|
||||||
|
|
@ -1703,6 +1711,13 @@ CAM.init = function(kiri, api) {
|
||||||
createPopOp('|', {}).inputs = {};
|
createPopOp('|', {}).inputs = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new popup operation (popOp) for a given type.
|
||||||
|
* @param {string} type - the name of the popOp to create
|
||||||
|
* @param {object} map - an object mapping popOp keys to either a string
|
||||||
|
* (representing a key in current.process) or a value (to be used as the default).
|
||||||
|
* @returns {object} the newly created popOp.
|
||||||
|
*/
|
||||||
function createPopOp(type, map) {
|
function createPopOp(type, map) {
|
||||||
let op = popOp[type] = {
|
let op = popOp[type] = {
|
||||||
div: UC.newElement('div', { id:`${type}-op`, class:"cam-pop-op" }),
|
div: UC.newElement('div', { id:`${type}-op`, class:"cam-pop-op" }),
|
||||||
|
|
|
||||||
|
|
@ -513,13 +513,14 @@ const conf = exports({
|
||||||
camPocketOutline: false,
|
camPocketOutline: false,
|
||||||
camPocketZTop: 0,
|
camPocketZTop: 0,
|
||||||
camPocketZBottom: 0,
|
camPocketZBottom: 0,
|
||||||
camDrillTool: 1000,
|
camDrillTool: 1006,
|
||||||
camDrillSpindle: 1000,
|
camDrillSpindle: 1000,
|
||||||
camDrillDownSpeed: 250,
|
camDrillDownSpeed: 250,
|
||||||
camDrillDown: 5,
|
camDrillDown: 5,
|
||||||
camDrillDwell: 250,
|
camDrillDwell: 250,
|
||||||
camDrillLift: 2,
|
camDrillLift: 2,
|
||||||
camDrillMark: false,
|
camDrillMark: false,
|
||||||
|
camDrillThru: 5,
|
||||||
camDrillingOn: false,
|
camDrillingOn: false,
|
||||||
camRegisterSpeed: 1000,
|
camRegisterSpeed: 1000,
|
||||||
camRegisterThru: 5,
|
camRegisterThru: 5,
|
||||||
|
|
|
||||||
|
|
@ -595,9 +595,16 @@ self.kiri.lang['en-us'] = {
|
||||||
cd_regi_l: ["drill registration holes","for double-sided parts","independent of enable","drilling but uses same","tool and settings"],
|
cd_regi_l: ["drill registration holes","for double-sided parts","independent of enable","drilling but uses same","tool and settings"],
|
||||||
cd_thru_s: "z extend",
|
cd_thru_s: "z extend",
|
||||||
cd_thru_l: ["extend downward cut through stock","in workspace units"],
|
cd_thru_l: ["extend downward cut through stock","in workspace units"],
|
||||||
|
cd_drlthru_s: "drill through",
|
||||||
|
cd_drlthru_l: ["additional drill depth below part bottom"],
|
||||||
cd_mark_s: "marking",
|
cd_mark_s: "marking",
|
||||||
cd_mark_l: ["only mark holes, do not drill out","the step down setting is used","to determine how deep to mark"],
|
cd_mark_l: ["only mark holes, do not drill out","the step down setting is used","to determine how deep to mark"],
|
||||||
|
|
||||||
|
cd_select_s: "select individual",
|
||||||
|
cd_select_l: ["individually select holes","to drill"],
|
||||||
|
cd_selall_s: "select all",
|
||||||
|
cd_selall_l: ["select all holes that", "match selected tool diameter"],
|
||||||
|
|
||||||
// CNC FLIP
|
// CNC FLIP
|
||||||
cf_menu: "flip",
|
cf_menu: "flip",
|
||||||
cf_nvrt_s: "z bottom",
|
cf_nvrt_s: "z bottom",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue