diff --git a/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui b/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui index 3f0b091e37..53710a2ad7 100644 --- a/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui @@ -6,8 +6,8 @@ 0 0 - 372 - 466 + 381 + 452 @@ -36,8 +36,8 @@ 0 0 - 354 - 418 + 363 + 403 @@ -48,262 +48,324 @@ 0 0 - 351 - 391 + 361 + 401 - - - 6 - - - 6 - - - 6 - - - 6 - - - 6 - - - - - - - <html><head/><body><p>Apply Lead In/Out on all layers</p></body></html> - - - Include Layers - - - - - - - Use Machine CRC - - - - - - - - - - - Extend In: - - - - - - - - 80 - 0 - - - - - - - - Extend Out: - - - - - - - - 80 - 0 - - - - - - - + + + + QLayout::SetDefaultConstraint + - - - Enable LeadIn + + + + 0 + 0 + - - - - - - Enable LeadOut - - - - - - - - - - - Length / Radius: - - - - - - 80 + 0 0 - 80 - 16777215 + 180 + 190 + + LeadIn + + + + + 10 + 30 + 161 + 151 + + + + + + + Enable LeadIn + + + + + + + + + Extend In: + + + + + + + + 60 + 0 + + + + + + + + + + + + Style In: + + + + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + Arc + + + + + Tangent + + + + + Perpendicular + + + + + + + + + + + + + + + 180 + 190 + + + + LeadOut + + + + + 10 + 30 + 161 + 151 + + + + + + + Enable LeadOut + + + + + + + + + Extend Out: + + + + + + + + 60 + 0 + + + + + + + + + + + + Style Out: + + + + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + Arc + + + + + Tangent + + + + + Perpendicular + + + + + + + + - - + + - - - Style In: - - + + + + + Length / Radius: + + + + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + - - - - 80 - 0 - - - - - 80 - 16777215 - - + - - Arc - + + + Radius / Center: + + - - Tangent - + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + Radius + + + + + Center + + + - - - Perpendicular - - - + - - - Style Out: - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - + - - Arc - + + + Keep Tool Down + + - - Tangent - + + + Rapid Plunge + + + + + + + + + + + <html><head/><body><p>Apply Lead In/Out on all layers</p></body></html> + + + Include Layers + + - - Perpendicular - + + + Use Machine CRC + + - - - - - - - - - - Keep Tool Down - - - - - - - Rapid Plunge - - - - - - - - - - - Radius / Center: - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - - Radius - - - - - Center - - - + diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py index f74bc9e809..f18c6851dd 100644 --- a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py +++ b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py @@ -26,7 +26,6 @@ from __future__ import print_function import FreeCAD import FreeCADGui import Path -#import PathScripts.PathDressupLeadInOut as PathDressupLeadInOut import PathScripts.PathDressup as PathDressup import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog