Commit Graph

208 Commits

Author SHA1 Message Date
Daniel Wood
5c0fbe75e4 Merge branch 'master' into feature/tooltable 2019-08-26 21:30:16 +01:00
Dubstar_04
51f96a40fc Allow multiple Tool Tables
Allow path to hold multiple tool tables
2019-08-26 07:59:09 +01:00
IMback
c8fda889a2 Peck retract height default changed from 10mm to opStartDepth+1
Peck depth default changed to tool dia*0.75
Fields changed to QuanitiySpinBoxes
Insure travel between regions is always performed at safe height
Make Peck and Dwell exclusive in GUI
Restore name of RetractHeight
Use SetupSheet for all numerical properties
2019-08-08 10:38:30 +02:00
IMback
0795b6633d Make Deburr Pannel rasonably sized 2019-07-28 23:25:26 +02:00
Markus Lampert
32ce6cc764 Added tooltips to depths transfer buttons. 2019-07-09 19:04:36 -07:00
Russell Johnson
8f50b057df Increase tool count limit to 99999 2019-05-27 14:39:13 -05:00
Russell Johnson
aaae829704 Path: Integrate 4th-axis feature to PathPocketShape and 3D Surface ops (#2114)
* PathSurface: Add StepDown support

Add StepDown support for PathSurface operation.
A low-level optimization algorithm is included.

* Update PageOpSurfaceEdit.ui

* PathSurface: Activate CompletionMode input

Update code to use CompletionMode selection from user.

* PathSurfaceGui: Add Completion Mode selection box

Add Completion Mode selection box for user input.

* PathSurface: Use depth_params() for step control

Implemented PathUtils.depth_params() for control of step downs to maintain consistency throughout PathWB.
Suggested by Sliptonic.

* PathSurface: Improve stability - Rev3

Organized code better, improved path optimization algorithm

* PathSurface: Add XY rotational surfacing

Add options to perform 3D surfacing by rotating object around X or Y axis.

* PathSurface: update setup function

Add properties to setup function

* PathSurface: Remove extraneous code

removed commented lines that consume processing time

* PathSurface: Correct nxt.z point assignment

Corrected error in nxt.z value assignment. Was assigning value to pnt.z instead of nxt.z

* PathSurface: Update 4th axis operation

Provided both parallel and perpendicular to axis  scans when performing rotational operation.

* PathSurface: Corrected Y-axis rotation to gcode

Inverted Y-axis scan values in gcode to produce correct result

* PathSurface: Adjust gcode feed rates

Adjust feed rates for axial rotations

* PathSurface: Implement waterline alternative

Used OCL dropcutter scan as data base for python algorithm to extract a waterline.  Waterline also incorporates step down feature.

* PathSurface: Update to 3m-Usable

stability improvements
fixed step on multi-pass 4th axis scans
initiate code to accommodate cut modes: zigzag, line
initiate code to accommodate offset cutter on 4th axis scans to simulate a tilted cutter for ball end mills

* PathSurface: Update 3m-Usable_r1

change instantiated static class attributes from value None, to 0.0

* PathSurface: Revert to 3i-Usable_r1

Further testing needed for 3m-Usable release

* PathSurface: Update to Rev. 3s Usable

fixed step over in rotational scans
start/stop indexes
tilt cutter adaptation for ball end mill
cut pattern: zigzag, line partially implemented
ignore waste option initiated for planar scans
cut mode partially implemented: conventional & climb

* PathSurface: Update to Rev. 3t Usable

Corrected rotational errors
corrected cutter tilt rotation
added "ignore waste" feature for planar surface operation

* Implement 4th-axis feature

Implement 4th-axis feature:
add gcode commands for rotation
re-compute operation heights, to consider rotation radii

* Deleted reference to undeclared variable

* Added missing class attributes/variables

* Added missing class variables/attributes

* Relocate class variables to higher class

* Remove references to undeclared variables

relocated class variables here
delete references to undeclared variables

* Correct rotation direction for normal-to-Y faces

* Remove X oriented 180 degree rotation adjustment

Probable error in FreeCAD gcode renderer, producing incorrect B axis rotation

* Update 4th-axis integration

Address FC error with B axis rotation rendering: user input to override error for visual alignment with model.
Correct pocket depths with Final Depth input enforced.
Add Reverse Direction flag input for reversing direction of pocket: necessary in some use cases.
NOTE: 4th-axis throws errors with Extension Corners feature.  EC feature needs 4th-axis rotation integration when calculating extensions for a particular part feature/face.
General testing needed.

* PathSurface: Add StepDown support

Add StepDown support for PathSurface operation.
A low-level optimization algorithm is included.

* Update PageOpSurfaceEdit.ui

* PathSurface: Activate CompletionMode input

Update code to use CompletionMode selection from user.

* PathSurfaceGui: Add Completion Mode selection box

Add Completion Mode selection box for user input.

* PathSurface: Use depth_params() for step control

Implemented PathUtils.depth_params() for control of step downs to maintain consistency throughout PathWB.
Suggested by Sliptonic.

* PathSurface: Improve stability - Rev3

Organized code better, improved path optimization algorithm

* PathSurface: Add XY rotational surfacing

Add options to perform 3D surfacing by rotating object around X or Y axis.

* PathSurface: update setup function

Add properties to setup function

* PathSurface: Remove extraneous code

removed commented lines that consume processing time

* PathSurface: Correct nxt.z point assignment

Corrected error in nxt.z value assignment. Was assigning value to pnt.z instead of nxt.z

* PathSurface: Update 4th axis operation

Provided both parallel and perpendicular to axis  scans when performing rotational operation.

* PathSurface: Corrected Y-axis rotation to gcode

Inverted Y-axis scan values in gcode to produce correct result

* PathSurface: Adjust gcode feed rates

Adjust feed rates for axial rotations

* PathSurface: Implement waterline alternative

Used OCL dropcutter scan as data base for python algorithm to extract a waterline.  Waterline also incorporates step down feature.

* PathSurface: Update to 3m-Usable

stability improvements
fixed step on multi-pass 4th axis scans
initiate code to accommodate cut modes: zigzag, line
initiate code to accommodate offset cutter on 4th axis scans to simulate a tilted cutter for ball end mills

* PathSurface: Update 3m-Usable_r1

change instantiated static class attributes from value None, to 0.0

* PathSurface: Revert to 3i-Usable_r1

Further testing needed for 3m-Usable release

* PathSurface: Update to Rev. 3s Usable

fixed step over in rotational scans
start/stop indexes
tilt cutter adaptation for ball end mill
cut pattern: zigzag, line partially implemented
ignore waste option initiated for planar scans
cut mode partially implemented: conventional & climb

* PathSurface: Update to Rev. 3t Usable

Corrected rotational errors
corrected cutter tilt rotation
added "ignore waste" feature for planar surface operation

* Implement 4th-axis feature

Implement 4th-axis feature:
add gcode commands for rotation
re-compute operation heights, to consider rotation radii

* Deleted reference to undeclared variable

* Added missing class attributes/variables

* Added missing class variables/attributes

* Relocate class variables to higher class

* Remove references to undeclared variables

relocated class variables here
delete references to undeclared variables

* Remove X oriented 180 degree rotation adjustment

Probable error in FreeCAD gcode renderer, producing incorrect B axis rotation

* Correct rotation direction for normal-to-Y faces

* Update 4th-axis integration

Address FC error with B axis rotation rendering: user input to override error for visual alignment with model.
Correct pocket depths with Final Depth input enforced.
Add Reverse Direction flag input for reversing direction of pocket: necessary in some use cases.
NOTE: 4th-axis throws errors with Extension Corners feature.  EC feature needs 4th-axis rotation integration when calculating extensions for a particular part feature/face.
General testing needed.

* Apply XYZ Model translations to paths; Add rotation axis selection property

* Spelling correction

ln 110

* Geometry list box: shrink height

560 to 400 height

* Update 4th-axis integration

Clean up code
Add comments for visionary elements
Apply axis selection to opHeights rotational calculations

* Update 4th-axis integration

Prepare sorting of vertical faces per axis_angle grouping, just as horizontal faces are sorted, for analysis as connected shapes

* Reset to FreeCAD master current

* Reset to current FreeCAD master version

* Update PathPocketBase.py

* Reset to current FreeCAD master

* Corrected __created__ date

* Convert all print() to PathLog.debug()

* Convert print() to PathLog.debug(); Clean up code

Use PathLog.debug over print() for troubleshooting
Clean up large commented sections of code.

* Convert print() to PathLog.debug(); combine duplicate methods

* Update last modified stamp

* Update last mofified timestamp

Also, removed commented-out code

* Typo corrected: "selt." to "self."

Discovered in https://api.travis-ci.org/v3/job/526456071/log.txt
on 30 April 2019 while searching for errors related to failure of PR #2114

* Restore initialization of self.depthparams

PR is failing Travis CI build test. Previous deletion of this code appears to be the reason.
See report at: https://api.travis-ci.org/v3/job/526492709/log.txt

* Convert tuple sizes from other PathWB ops

* B-axis rotation: render correction

* Revert "rebase to FC master 2019-05-02"

* Correct depthparams opOnDocumentRestored() issue

* Relocate "UseRotation" property from PathAreaOp.py

* Improve meshFromShape() calculation per @sliptonic

faster mesh creation
helps smooth jagged lines in path results

* Part: Make 3rd party libraries into PCH

* PartDesign: 3rdParty to PCH

* Sketcher: PCH

* PartDesign: PCH GUI

* Sketcher: GUI PCH

* Travis windows build (#2110)

Travis windows build

* Travis: enable clcache debug

* disable travis clcache debug

* respect user settings for dialog used in merge-document command

* msbuild verbose and logo

* Travis force wait 60 minutes

* Travis: Use & between vars sourcing and msbuild

* Travis: Move building to external batch script (#2131)

* Travis: Move building to external batch script

* Travis: double quotes to escape route

* Travis: use cmd.exe to call batch file

* Crowdin: fix grammatical error + whitespace 

https://crowdin.com/translate/freecad/569/en-fi#6498705

* Crowdin: experiment to fix crowdin 'ghost' strings

The following translation strings still perpetuate after updating crowdin translations. This commit experiments with removing their source counterparts in the FC .ts files. I'm not sure why they are not rendered obsolete by the normal operations. 
  
* https://crowdin.com/translate/freecad/6766/en-en#6499472  
* https://crowdin.com/translate/freecad/6766/en-en#6573450

* fix for edit tracker draw styles

* deleted commented code

* Travis: filter out

* AddonManager: allow to add custom repositories

* Revert "rebase to FC master 2019-05-02"

* Draft: Fixed Draft text justification

* Arch: Fixed bug in arch windows creation

* Arch: Fixed export of windows colors to IFC

* Draft: Fixed 0.18.1 bug in DXF importer

* Arch: Fixed wrong exported objects in IFC export

* Arch: Fixed export of sites to IFC

* Start: Fixed bad default icon in start page

* Correct depthparams opOnDocumentRestored() issue

* Relocate "UseRotation" property from PathAreaOp.py

* Improve meshFromShape() calculation per @sliptonic

faster mesh creation
helps smooth jagged lines in path results

* Relocate "UseRotation" property in PathAreaOp.py

* Syntax correction

Travis CI python 3.7 build test fails regularly due to syntax error at this point

* Correct rebase issue: PR #2114

* Correct rebase issue: PR #2114

* Correct rebase issue: PR #2114

* Correct rebase issue: PR #2114

* Correct rebase issue: PR #2114

* Correct rebase issue: PR #2114

* path pep8 cleanup

* Multi-face geometry selection repaired

Previous version broke ability to select process multiple faces selected by user in geometry tab in operation task window.
Also performed some syntax cleaning per PEP8 linter

* Update script version info
2019-05-06 21:29:08 -05:00
luz.paz
0238906d38 Misc. typo and whitespace fixes
Found via `codespell`
2019-04-30 10:15:59 -03:00
Markus Lampert
8e457a6694 Adding tool tips to pocket extension dialog 2019-04-07 12:20:45 +02:00
Markus Lampert
01b3f57084 Fixed colour for visibility and changed selection model to extended. 2019-04-07 12:20:45 +02:00
Markus Lampert
b583439b27 Added Show All pocket extension checkbox for better UX. 2019-04-07 12:20:44 +02:00
Markus Lampert
0367c28fbc Added support for global extend corners 2019-04-07 12:20:44 +02:00
Markus Lampert
b01d10055b Switched extension UI to tree view dependent on the base objects. 2019-04-07 12:20:43 +02:00
markus
10428fd3cb Using offset2D for properly creating the extension 2019-04-07 12:20:42 +02:00
markus
159f5ae931 Basic UI to add extension features. 2019-04-07 12:20:41 +02:00
markus
068c0724e8 Basic UI for editing pocket shape extensions. 2019-04-07 12:20:41 +02:00
markus
79def8b235 Added UI page pocket extension; changed selection agent. 2019-04-07 12:20:41 +02:00
sliptonic
c6915a24e1 tool tips, Gui cleanup 2019-04-05 15:04:02 +02:00
sliptonic
993d179e7c icon for inactive 2019-04-05 15:04:02 +02:00
sliptonic
1bbb5c2457 Path: GUI for fixture support working 2019-04-05 15:04:01 +02:00
sliptonic
ae1aeb5a0d Path: ordering works reasonably well
Splitting works reasonably well
2019-04-05 15:04:01 +02:00
sliptonic
388a671ac2 Path: UI changes to job edit
.gitignore

More UI work

checkpoint
2019-04-05 15:04:01 +02:00
Markus Lampert
cc7ee99180 Enable multiple copies of a model as base object for a job 2019-04-03 15:23:21 +02:00
Markus Lampert
381f087536 Using fixed size images for qt5/4 compatibility 2019-01-05 12:30:41 +01:00
Markus Lampert
81729f6621 Setting fixed size for tool images 2019-01-05 12:30:41 +01:00
pekkaroi
2f2f5af4c2 Path: PathSurface task panel update 2018-11-04 14:49:21 -03:00
Markus Lampert
97ad1b687f Renamed Path Chamfer op to Deburr. 2018-09-17 10:27:49 +02:00
Markus Lampert
91371a6c6a Added option to rotate multiple base objects as a compound or individually. 2018-09-17 10:23:41 +02:00
Markus Lampert
7925da828e Fixed merge issues 2018-09-11 07:24:37 +02:00
Markus Lampert
3d646ecd4e Changed base model tab view to a tree view 2018-09-11 07:24:36 +02:00
Markus Lampert
cc2ffc38a8 Added jobs as a selection for the base models. 2018-09-11 07:24:32 +02:00
Markus Lampert
bcfd92d388 Refactored job creation dialog to be re-used for model selection dialog. 2018-09-11 07:24:30 +02:00
Markus Lampert
d78d65628a Basic job creation dialog with multiple base models. 2018-09-11 07:24:30 +02:00
Markus Lampert
ec8e97c262 Fixed merge issues 2018-09-02 00:32:22 -07:00
markus
67987cc916 Added job export dialog to Job Editor. 2018-09-02 00:32:22 -07:00
markus
ff54af4e9b Redesigned ops defaults to use combo box for op selection and only have one editor visibile at the time. 2018-09-02 00:32:22 -07:00
markus
84b681eb2b PathEdit integration of the setup-sheet editor. 2018-09-02 00:32:22 -07:00
Markus Lampert
74d3bf4856 Added support for property types required for PocketShape settings. 2018-09-02 00:32:22 -07:00
Markus Lampert
a3cd80796b Template export/import of operation settings. 2018-09-02 00:32:22 -07:00
Markus Lampert
ac84092e75 Basic property editor framework 2018-09-02 00:32:22 -07:00
Markus Lampert
b93d39f701 UI for operation's setup sheet. 2018-09-02 00:32:22 -07:00
Markus Lampert
853ad14a1a Basic UI/editor for the SetupSheet. 2018-09-02 00:32:22 -07:00
markus
8054540afe Added button to stock dialog to recreate the stock object. 2018-09-01 21:01:03 +02:00
Markus Lampert
04807fddd7 Add UseOutline property to PocketShape in order to mill full pockets and not have to add all sub-shapes. 2018-08-18 21:55:26 +02:00
Markus Lampert
5fa725c188 Always use climb milling for closed wires. 2018-07-06 22:08:46 -07:00
Markus Lampert
0a7074cd10 Added join to chamfer properties and UI. 2018-07-06 22:08:46 -07:00
Markus Lampert
ec0e9d1d91 Basic chamfer op framework. 2018-07-06 22:08:46 -07:00
Markus Lampert
0c71bc9f93 Consolidated path tool editor and added customized support for endmill, drill and v-bit. 2018-07-06 22:08:46 -07:00
luz.paz
5f7df347f8 Path: misc. source comment typos 2018-04-25 11:03:10 +02:00
sliptonic
5ffc4f983e Path: add stock boundary as choice for millface
fixes #3326
2018-02-09 15:58:44 +01:00