Marius Stanciu
5ff3f66b04
Merge https://bitbucket.org/jpcgt/flatcam/src/master into Follow_TCL_command_add_to_new_architecture
...
# Conflicts:
# FlatCAMApp.py
2018-05-31 17:53:35 +03:00
Marius Stanciu
9e79843026
Merged in marius_stanciu/flatcam_mpl/Port_to_Python3k (pull request #84 )
...
Conversion from Python2 code to Python3 code
2018-05-31 13:15:50 +00:00
Marius Stanciu
c67d2f0028
- modified the TCL comamand follow to the new architecture. Tested it and
...
it works without crashes. It can be safely pulled in.
2018-05-31 02:09:15 +03:00
Marius Stanciu
d8ea4a268c
- hopefully this will solve the conflict
2018-05-31 01:19:11 +03:00
Marius Stanciu
0b49a061be
- hopefully this will solve the conflict
2018-05-31 01:14:04 +03:00
Marius Stanciu
969eb933fb
- hopefully this will solve the conflict
2018-05-31 01:11:17 +03:00
Marius Stanciu
d50bac4d71
- hopefully this will solve the conflict
2018-05-31 01:08:52 +03:00
Marius Stanciu
98c5460876
Merged jpcgt/flatcam into master
2018-05-31 00:59:05 +03:00
Marius Stanciu
8a9c4b4648
Merged in marius_stanciu/flatcam_mpl/fix_calls_to_info() (pull request #96 )
...
Fix issue #254
2018-05-30 20:04:27 +00:00
Marius Stanciu
c85a142759
- fixing issue #254
...
- replaced (as per advice from @jpcgt) the lines with app.info call
to using a signal which is safe to use in a threaded environment,
app.inform.emit()
2018-05-30 22:52:50 +03:00
Marius Stanciu
a6a26de0d3
Merge https://bitbucket.org/jpcgt/flatcam/src/master into Port_to_Python3k
...
# Conflicts:
# ObjectCollection.py
2018-05-30 20:38:43 +03:00
Marius Stanciu
4cf06b71e8
- for whatever reason, using directly the name of the object in a
...
QtGui.QStadardItem is creating issues in the tests. Converting it to a
string solve this. After solving the conflict in the pull request this
modification was lost so I am doing it again.
- the FlatCAMObj.FlatCAMGerber.isolate() method is having the line
app.obj.info() which randomly create issues due of using QPixMaps outside
of the GUI thread.
2018-05-30 18:39:04 +03:00
Marius Stanciu
3298da6dc5
- solve the conflicted files (hopefully) without CLI commands
2018-05-30 18:02:44 +03:00
Marius Stanciu
41dffe44d4
Merge https://bitbucket.org/marius_stanciu/flatcam_mpl/src/master into Port_to_Python3k
2018-05-30 17:54:34 +03:00
Marius Stanciu
6f53d38338
Merged in marius_stanciu/flatcam_mpl/CTRL+LMB_copy_coords_on_clipboard (pull request #95 )
...
- CTRL+mouse_click to copy the click coords to clipboard
2018-05-30 13:21:59 +00:00
Marius Stanciu
560e882da0
- made sure FlatCAM use python3 in Linux (JP's find)
...
- cgi module is deprecated in Python3, using the recommended module html
as replacement
2018-05-30 15:54:14 +03:00
Marius Stanciu
aff21d7cb0
- changed the default way to copy the coordinates to clipboard. Before,
...
at each mouse click on canvaas the coordinates were copied to clipboard.
Now for the same feet it require to have the CTRL key pressed while
clicking on canvas for the coordinates to be copied.
2018-05-30 08:02:03 +03:00
Marius Stanciu
205d878052
Merged table_tool_new_column into master
2018-05-30 03:02:19 +03:00
Marius Stanciu
7ec6914422
Merged Improve_panelize_Tcl_command into master
2018-05-30 03:00:42 +03:00
Marius Stanciu
3b9767cc6f
- I've finally run the tests with OK result (56 tests in 102.937 sec)
...
- I had to play with module imports as they created a lot of error in
the tests although in reality the program worked OK.
- I've fixed some mistakes in TcL commands (they were testing isinstance
against the like of Geometry instead of FlatCAMGeometry)
- I've had to add some fixes in ObjectCollections.py (error on
create_index() method but Marco already fixed this in the checkbox
in project tab pull request and knew about this.
- Although at some point the tests run fine, I've made some checkings
on my own over the Tcl commands and discovered errors which I fixed as
mentioned above.
- conclusion is that tests are just a must and do not cover everything
(like saving projects which at some point by juggling with imports I
braked and tests were 100% OK)
2018-05-30 02:17:34 +03:00
Marius Stanciu
08e402f2ad
Merged in marius_stanciu/flatcam_mpl/Improve_panelize_Tcl_command (pull request #92 )
...
Improve Panelize Tcl command
2018-05-29 16:58:39 +00:00
Marius Stanciu
1242382002
Merged in marius_stanciu/flatcam_mpl/table_tool_new_column (pull request #88 )
...
Table tool new column show number of drills for each tool
2018-05-29 15:55:25 +00:00
Marius Stanciu
da9f890c39
Merged master into Port_to_Python3k
2018-05-29 17:43:33 +03:00
Marius Stanciu
214f4491ae
Merged TCL_edit_focus into master
2018-05-29 17:40:32 +03:00
Marius Stanciu
1621299532
Merged allow_lowercase_units_in_set_sys_command into master
2018-05-29 17:39:55 +03:00
Marius Stanciu
a75c8bb6e9
Merged in marius_stanciu/flatcam_mpl/allow_lowercase_units_in_set_sys_command (pull request #91 )
...
Allow lowercase units in set sys command
2018-05-29 13:54:02 +00:00
Marius Stanciu
4bacc22b1f
Merged in marius_stanciu/flatcam_mpl/TCL_edit_focus (pull request #93 )
...
TCL edit focus
2018-05-29 03:04:18 +00:00
Marius Stanciu
b85c490256
- Tcl shell is no longer loosing focus after entering a command
...
(borrowed from @brainstorm)
2018-05-29 03:46:33 +03:00
Marius Stanciu
4c0884e16d
- when using .keys method (in Python3 is no longer atomic operation) to
...
make it more resilient to multithreading I've added the more costing
operation of copy().
2018-05-29 03:42:35 +03:00
MARCO A QUEZADA
20bb287586
Merged in codeZonkey/flatcam/plotToggle (pull request #87 )
...
PlotToggle
2018-05-28 20:50:40 +00:00
Marius Stanciu
ef611753a6
- added the posibility to create an object without plotting it. Also if
...
the project is created with plot=False then it will not be checked in
Project tab
- improved the panelize command by toggling OFF the plot for the
temporary objects. There is no need to plot the temporary objects, only
the panel is of interest
- add a few aliases for the Panelize command ('pan' and 'panel')
2018-05-28 15:46:42 +03:00
Marius Stanciu
5c6b68d7cb
- forgot to make the changes to sorted_tools in generate_milling method
...
from FlatCAMObj.py
2018-05-28 13:55:20 +03:00
Marius Stanciu
3fae21622a
- allow the usage of lowercase units names (like mm or in) when used in
...
the Tcl command set_sys
2018-05-27 14:03:19 +03:00
Marius Stanciu
bc4411d566
- added a new column in the TableTool where I show the number of drill
...
holes for each tool.
2018-05-27 12:07:57 +03:00
mquezada
fca9f0ca88
Double clicking on the object label in the Project list view should select the object and take user to Selected tab.
2018-05-26 19:43:01 -04:00
mquezada
5d1f4338a4
Merge branch 'master' into plotToggle
2018-05-26 19:35:49 -04:00
Marius Stanciu
eb0637c5bb
- minor PEP changes
2018-05-26 19:10:07 +03:00
Marius Stanciu
a4bbb98bf1
- converted from Python2 code to Python3 code
...
- in camlib.py, CNCJob class -> generate_from_excellon_by_tool() was
failing in the line to sort the tools due of been unable to compare
between dict's. I replaced that section.
2018-05-26 04:43:40 +03:00
Jakob Staudt
f7f7c54e5e
Merged in JakobStaudt/postprocessing (pull request #82 )
...
Postprocessing GUI and content handover to export_gcode()
2018-05-24 13:37:49 +00:00
Jakob Staudt
c34c59f870
Changed Indentation to Spaces
2018-05-24 10:16:48 +00:00
Jakob Staudt
20bc6b4da5
Fixed Indentation Error in line 1077
2018-05-24 10:04:47 +00:00
Jakob Staudt
6877d0cd9b
Added postprocessing GUI and Code
2018-05-24 11:57:42 +02:00
Jakob Staudt
bdc2d8cc59
Added postprocessing GUI and Code
2018-05-24 11:52:02 +02:00
MARCO A QUEZADA
bb3b07455c
Merged in codeZonkey/flatcam/plotToggle (pull request #77 )
...
PlotToggle - From the Project tab
2018-05-19 01:56:36 +00:00
MARCO A QUEZADA
a7cb9e7801
Merged in codeZonkey/flatcam (pull request #78 )
...
Fix issue #248 where set_sys command returned failure feedback even on command success.
2018-05-19 01:55:37 +00:00
mquezada
cd28ff9fdd
Fix issue #248 where set_sys command returned failure feedback even on command success.
2018-05-17 18:28:58 -04:00
mquezada
8aaeee23fd
Fix model reference for test.
2018-05-16 16:05:23 -04:00
mquezada
9564ab7334
Part 3, removed tab_change handler.
2018-05-04 19:43:29 -04:00
mquezada
1fae35e3f2
Incorporating comments and functionality frpm JP. Removed need to use tab_change signal, removed inheritance dependency on QAbstractItemModel, implemented option_changed property. part 2.
2018-05-04 19:41:38 -04:00
mquezada
e971372d7c
Incorporating comments and functionality frpm JP. Removed need to use tab_change signal, removed inheritance dependency on QAbstractItemModel, implemented option_changed property.
2018-05-04 19:41:20 -04:00