3d3eaef02e
CAM/App/PathSegmentWalker.cpp - Add G74 to drill/tap/bore G-code recognition for tapping cycles CAM/InitGui.py - Move CAM_Tapping command behind experimental feature flag - Only group drilling/tapping commands if both are enabled CAM/Path/Base/Generator/tapping.py - Add pitch and spindle_speed parameters to tapping.generate - Output S (spindle speed) and F (pitch) in generated G-code CAM/Path/Op/Tapping.py - Require Pitch property for tap tools and SpindleSpeed for tool controllers - Pass pitch and spindle speed to tapping.generate - Use SpindleDirection to determine right/left hand tap CAM/Path/Post/scripts/linuxcnc_post.py - Handle G84/G74 tapping cycles: convert pitch and spindle speed to feed rate - Remove F and S from output and recalculate F as needed CAM/Path/Tool/shape/models/tap.py - Add Pitch property to ToolBitShapeTap schema - CAM/Path/Tool/toolbit/models/tap.py - Show pitch and rotation in tap tool summary - Use is_imperial_pitch to format pitch as TPI or mm CAM/Path/Tool/toolbit/util.py - Add is_imperial_pitch utility to classify pitch as imperial or metric CAM/Tools/Bit/375-16_Tap.fctb - Remove unused parameters (Coating, Rotation, TPI, Type) - Keep only relevant tap parameters for new schema
80 lines
3.3 KiB
Python
80 lines
3.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
# ***************************************************************************
|
|
# * Copyright (c) 2025 Samuel Abels <knipknap@gmail.com> *
|
|
# * *
|
|
# * This program is free software; you can redistribute it and/or modify *
|
|
# * it under the terms of the GNU Lesser General Public License (LGPL) *
|
|
# * as published by the Free Software Foundation; either version 2 of *
|
|
# * the License, or (at your option) any later version. *
|
|
# * for detail see the LICENCE text file. *
|
|
# * *
|
|
# * This program is distributed in the hope that it will be useful, *
|
|
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
# * GNU Library General Public License for more details. *
|
|
# * *
|
|
# * You should have received a copy of the GNU Library General Public *
|
|
# * License along with this program; if not, write to the Free Software *
|
|
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
|
|
# * USA *
|
|
# * *
|
|
# ***************************************************************************
|
|
import FreeCAD
|
|
|
|
|
|
def to_json(value):
|
|
"""Convert a value to JSON format."""
|
|
if isinstance(value, FreeCAD.Units.Quantity):
|
|
return value.UserString
|
|
return value
|
|
|
|
|
|
def format_value(value: FreeCAD.Units.Quantity | int | float | None, precision: int | None = None):
|
|
if value is None:
|
|
return None
|
|
elif isinstance(value, FreeCAD.Units.Quantity):
|
|
if precision is not None:
|
|
user_val, _, user_unit = value.getUserPreferred()
|
|
if user_unit in ("deg", "°", "degree", "degrees"):
|
|
# Remove the last character (degree symbol) and convert to float
|
|
try:
|
|
deg_val = float(str(user_val)[:-1])
|
|
except Exception:
|
|
return value.getUserPreferred()[0]
|
|
formatted_value = f"{deg_val:.1f}".rstrip("0").rstrip(".")
|
|
return f"{formatted_value}°"
|
|
# Format the value with the specified number of precision and strip trailing zeros
|
|
return value.getUserPreferred()[0]
|
|
return value.UserString
|
|
return str(value)
|
|
|
|
|
|
def is_imperial_pitch(pitch_mm, tol=1e-6):
|
|
"""
|
|
Classify a pitch in mm as imperial vs metric.
|
|
Rule:
|
|
- If pitch_mm is ~2 decimal places clean -> metric,
|
|
unless it corresponds to an exact whole-number TPI.
|
|
- Otherwise, treat as imperial.
|
|
"""
|
|
import math
|
|
|
|
try:
|
|
mm = float(pitch_mm)
|
|
except Exception:
|
|
return False
|
|
if mm <= 0:
|
|
return False
|
|
|
|
# Check if it's "two-decimal clean"
|
|
two_dec_clean = abs(mm - round(mm, 2)) <= tol
|
|
|
|
# Compute TPI
|
|
tpi = 25.4 / mm
|
|
whole_tpi = round(tpi)
|
|
is_whole_tpi = math.isclose(tpi, whole_tpi, abs_tol=1e-6)
|
|
|
|
if two_dec_clean and not is_whole_tpi:
|
|
return False # metric
|
|
return True # imperial
|