diff --git a/Autodesk_Setup_BIDC/setup-sheet.cps b/Autodesk_Setup_BIDC/setup-sheet.cps index e0dec92..a585ed1 100644 --- a/Autodesk_Setup_BIDC/setup-sheet.cps +++ b/Autodesk_Setup_BIDC/setup-sheet.cps @@ -856,13 +856,7 @@ function presentTool(tool) { var c1 = ""; if (!tool.isJetTool()) { - c1 += makeRow( - makeColumn( - bold(localize("T") + toolFormat.format(tool.number)) + " " + - localize("D") + toolFormat.format(!tool.isTurningTool() ? tool.diameterOffset : tool.compensationOffset) + " " + - conditional(!tool.isTurningTool(), localize("L") + toolFormat.format(tool.lengthOffset)) - ) - ); + c1 += makeRow(bold(localize("T") + toolFormat.format(tool.number)) + ": " + v(tool.description)); } else if (tool.isJetTool()) { c1 += makeRow(makeColumn(" ")); // move 1 row down } @@ -890,7 +884,7 @@ function presentTool(tool) { } } if (!tool.isJetTool()) { - c1 += makeRow(makeColumn(d(localize("Length") + ": ") + v(spatialFormat.format(tool.bodyLength) + getUnitSymbolAsString()))); + c1 += makeRow(makeColumn(d(localize("Length Below Holder") + ": ") + v(spatialFormat.format(tool.bodyLength) + getUnitSymbolAsString()))); if (tool.numberOfFlutes > 0) { c1 += makeRow(makeColumn(d(localize("Flutes") + ": ") + v(tool.numberOfFlutes))); } @@ -1028,9 +1022,11 @@ function presentTool(tool) { if (tool.material) { c1 += makeRow(makeColumn(d(localize("Material") + ": ") + v(getMaterialName(tool.material)))); } - if (tool.description) { - c1 += makeRow(makeColumn(d(localize("Description") + ": ") + v(tool.description))); - } + // if (tool.description) { + // c1 += makeRow(makeColumn(d(localize("Description") + ": ") + v(tool.description))); + // } + + // Make more visible if (tool.comment) { c1 += makeRow(makeColumn(d(localize("Comment") + ": ") + v(tool.comment))); } @@ -1065,60 +1061,60 @@ function writeTools() { var c1 = presentTool(tool); c1 += "
"; - var c2 = ""; - c2 += makeRow(makeColumn(" ")); // move 1 row down - if (zRanges[tool.number]) { - c2 += makeRow(makeColumn(d(localize("Minimum Z") + ": ") + v(spatialFormat.format(zRanges[tool.number].getMinimum()) + getUnitSymbolAsString()))); - } - - var maximumFeed = 0; - var maximumSpindleSpeed = 0; - var cuttingDistance = 0; - var rapidDistance = 0; - var cycleTime = 0; - for (var j = 0; j < getNumberOfSections(); ++j) { - var section = getSection(j); - if (!isProbeOperation(section)) { - if (section.getTool().number == tool.number) { - maximumFeed = Math.max(maximumFeed, section.getMaximumFeedrate()); - if ((section.type == TYPE_MILLING) || (section.type == TYPE_TURNING)) { - if (maximumSpindleSpeed !== undefined) { - maximumSpindleSpeed = (section.type == TYPE_MILLING) ? - Math.max(maximumSpindleSpeed, section.getMaximumSpindleSpeed()) : - Math.max(maximumSpindleSpeed, section.getTool().getMaximumSpindleSpeed()); - } else { - maximumSpindleSpeed = (section.type == TYPE_MILLING) ? - section.getMaximumSpindleSpeed() : - section.getTool().getMaximumSpindleSpeed(); - } - } - cuttingDistance += section.getCuttingDistance(); - rapidDistance += section.getRapidDistance(); - cycleTime += section.getCycleTime(); - } - } - } - if (getProperty("rapidFeed") > 0) { - cycleTime += rapidDistance / getProperty("rapidFeed") * 60; - } - - c2 += makeRow(makeColumn(d(localize("Maximum Feed") + ": ") + v(feedFormat.format(maximumFeed) + getFeedSymbolAsString()))); - if (maximumSpindleSpeed !== undefined) { - c2 += makeRow(makeColumn(d(localize("Maximum Spindle Speed") + ": ") + v(rpmFormat.format(maximumSpindleSpeed) + localize("rpm")))); - } - c2 += makeRow(makeColumn(d(localize("Cutting Distance") + ": ") + v(spatialFormat.format(cuttingDistance) + getUnitSymbolAsString()))); - if (getProperty("showRapidDistance")) { - c2 += makeRow(makeColumn(d(localize("Rapid Distance") + ": ") + v(spatialFormat.format(rapidDistance) + getUnitSymbolAsString()))); - } - var additional = ""; - if ((getNumberOfSections() > 1) && getProperty("showPercentages")) { - if (totalCycleTime > 0) { - additional = "
(" + percentageFormat.format(cycleTime / totalCycleTime) + "%)
"; - } - } - c2 += makeRow(makeColumn(d(localize("Estimated Cycle Time") + ": ") + v(formatCycleTime(cycleTime) + " " + additional))); - // c2 += ""; // fixed width - c2 += "
 
"; + // var c2 = ""; + // c2 += makeRow(makeColumn(" ")); // move 1 row down + // if (zRanges[tool.number]) { + // c2 += makeRow(makeColumn(d(localize("Minimum Z") + ": ") + v(spatialFormat.format(zRanges[tool.number].getMinimum()) + getUnitSymbolAsString()))); + // } + + // var maximumFeed = 0; + // var maximumSpindleSpeed = 0; + // var cuttingDistance = 0; + // var rapidDistance = 0; + // var cycleTime = 0; + // for (var j = 0; j < getNumberOfSections(); ++j) { + // var section = getSection(j); + // if (!isProbeOperation(section)) { + // if (section.getTool().number == tool.number) { + // maximumFeed = Math.max(maximumFeed, section.getMaximumFeedrate()); + // if ((section.type == TYPE_MILLING) || (section.type == TYPE_TURNING)) { + // if (maximumSpindleSpeed !== undefined) { + // maximumSpindleSpeed = (section.type == TYPE_MILLING) ? + // Math.max(maximumSpindleSpeed, section.getMaximumSpindleSpeed()) : + // Math.max(maximumSpindleSpeed, section.getTool().getMaximumSpindleSpeed()); + // } else { + // maximumSpindleSpeed = (section.type == TYPE_MILLING) ? + // section.getMaximumSpindleSpeed() : + // section.getTool().getMaximumSpindleSpeed(); + // } + // } + // cuttingDistance += section.getCuttingDistance(); + // rapidDistance += section.getRapidDistance(); + // cycleTime += section.getCycleTime(); + // } + // } + // } + // if (getProperty("rapidFeed") > 0) { + // cycleTime += rapidDistance / getProperty("rapidFeed") * 60; + // } + + // c2 += makeRow(makeColumn(d(localize("Maximum Feed") + ": ") + v(feedFormat.format(maximumFeed) + getFeedSymbolAsString()))); + // if (maximumSpindleSpeed !== undefined) { + // c2 += makeRow(makeColumn(d(localize("Maximum Spindle Speed") + ": ") + v(rpmFormat.format(maximumSpindleSpeed) + localize("rpm")))); + // } + // c2 += makeRow(makeColumn(d(localize("Cutting Distance") + ": ") + v(spatialFormat.format(cuttingDistance) + getUnitSymbolAsString()))); + // if (getProperty("showRapidDistance")) { + // c2 += makeRow(makeColumn(d(localize("Rapid Distance") + ": ") + v(spatialFormat.format(rapidDistance) + getUnitSymbolAsString()))); + // } + // var additional = ""; + // if ((getNumberOfSections() > 1) && getProperty("showPercentages")) { + // if (totalCycleTime > 0) { + // additional = "
(" + percentageFormat.format(cycleTime / totalCycleTime) + "%)
"; + // } + // } + // c2 += makeRow(makeColumn(d(localize("Estimated Cycle Time") + ": ") + v(formatCycleTime(cycleTime) + " " + additional))); + // // c2 += ""; // fixed width + // c2 += "
 
"; var c3 = ""; c3 += makeRow(makeColumn(" ")); // move 1 row down @@ -1203,7 +1199,7 @@ function writeTools() { write( makeRow( "" + - "" + + // "" + "" + "", "info" @@ -1847,7 +1843,7 @@ function writeTotals() { var c1 = "
" + c1 + "" + c2 + "" + c2 + "" + c3 + "" + c4 + "
"; var tools = getToolTable(); - c1 += makeRow(makeColumn(d(localize("Number Of Operations") + ": ") + v(getNumberOfSections()))); + // c1 += makeRow(makeColumn(d(localize("Number Of Operations") + ": ") + v(getNumberOfSections()))); var text = ""; var gotTool = false; for (var i = 0; i < tools.getNumberOfTools(); ++i) { @@ -1858,10 +1854,10 @@ function writeTotals() { gotTool |= tool.number != 0; text += bold(localize("T") + toolFormat.format(tool.number)); } - if ((section.type == TYPE_MILLING) || (section.type == TYPE_TURNING) || gotTool) { - c1 += makeRow(makeColumn(d(localize("Number Of Tools") + ": ") + v(tools.getNumberOfTools()))); - c1 += makeRow(makeColumn(d(localize("Tools") + ": ") + vWrap(text))); - } + // if ((section.type == TYPE_MILLING) || (section.type == TYPE_TURNING) || gotTool) { + // c1 += makeRow(makeColumn(d(localize("Number Of Tools") + ": ") + v(tools.getNumberOfTools()))); + // c1 += makeRow(makeColumn(d(localize("Tools") + ": ") + vWrap(text))); + // } if (zRange) { c1 += makeRow(makeColumn(d(localize("Maximum Z") + ": ") + v(spatialFormat.format(zRange.getMaximum()) + getUnitSymbolAsString()))); c1 += makeRow(makeColumn(d(localize("Minimum Z") + ": ") + v(spatialFormat.format(zRange.getMinimum()) + getUnitSymbolAsString()))); @@ -1870,10 +1866,10 @@ function writeTotals() { if (maximumSpindleSpeed !== undefined) { c1 += makeRow(makeColumn(d(localize("Maximum Spindle Speed") + ": ") + v(rpmFormat.format(maximumSpindleSpeed) + localize("rpm")))); } - c1 += makeRow(makeColumn(d(localize("Cutting Distance") + ": ") + v(spatialFormat.format(cuttingDistance) + getUnitSymbolAsString()))); - if (getProperty("showRapidDistance")) { - c1 += makeRow(makeColumn(d(localize("Rapid Distance") + ": ") + v(spatialFormat.format(rapidDistance) + getUnitSymbolAsString()))); - } + // c1 += makeRow(makeColumn(d(localize("Cutting Distance") + ": ") + v(spatialFormat.format(cuttingDistance) + getUnitSymbolAsString()))); + // if (getProperty("showRapidDistance")) { + // c1 += makeRow(makeColumn(d(localize("Rapid Distance") + ": ") + v(spatialFormat.format(rapidDistance) + getUnitSymbolAsString()))); + // } c1 += makeRow(makeColumn(d(localize("Estimated Cycle Time") + ": ") + v(formatCycleTime(cycleTime)))); c1 += "
"; diff --git a/Autodesk_Setup_BIDC/setup-sheet.css b/Autodesk_Setup_BIDC/setup-sheet.css index 48628cf..0a21c27 100644 --- a/Autodesk_Setup_BIDC/setup-sheet.css +++ b/Autodesk_Setup_BIDC/setup-sheet.css @@ -4,11 +4,11 @@ All rights reserved */ -@import url("https://use.typekit.net/sgs7pgb.css"); +/* @import url("https://use.typekit.net/sgs7pgb.css"); */ body { background-color: #CFB991; - font-family: acumin-pro, 'Franklin Gothic', sans-serif; + font-family: 'Roboto', 'Franklin Gothic', sans-serif; padding: 4rem; } @@ -77,7 +77,7 @@ table.info td { .model img { width: 100%; - max-width: 60rem; + max-width: 40rem; } .preview img {