Commit Graph

619 Commits

Author SHA1 Message Date
Marius Stanciu 175fe8c410 Merge https://bitbucket.org/jpcgt/flatcam/src/master into auto_select_line_entry_content
# Conflicts:
#	FlatCAMDraw.py
2018-05-31 19:44:25 +03:00
Marius Stanciu b7d95feae3 Merged in marius_stanciu/flatcam_mpl/Menu_clening_icons_adding (pull request #94)
Menu-Toolbars cleaning / adding icons / adding buttons
2018-05-31 15:41:14 +00:00
Idechix 665060a185 Merged in idechix/flatcam (pull request #79)
adding GUI interface for mirror and auto offset functions
2018-05-31 15:37:04 +00:00
Marius Stanciu b005058586 Merge https://bitbucket.org/jpcgt/flatcam/src/master into Menu_clening_icons_adding
# Conflicts:
#	FlatCAMDraw.py
#	FlatCAMGUI.py
2018-05-31 18:31:35 +03:00
Marius Stanciu 1cd7e910ba Merged in marius_stanciu/flatcam_mpl/Follow_TCL_command_add_to_new_architecture (pull request #99)
Remade the pull request related to Follow command
2018-05-31 15:30:23 +00:00
Marius Stanciu 090fdf2b39 Merge https://bitbucket.org/jpcgt/flatcam/src/master into Menu_clening_icons_adding
# Conflicts:
#	FlatCAMDraw.py
#	FlatCAMGUI.py
2018-05-31 18:11:41 +03:00
Marius Stanciu 73a3c4beb8 Merge https://bitbucket.org/jpcgt/flatcam/src/master into convert_script_make_win32.py_for_cxfreeze5
# Conflicts:
#	make_win32.py
2018-05-31 18:04:36 +03:00
Marius Stanciu e99fd1f6ae Merge https://bitbucket.org/jpcgt/flatcam/src/master into auto_select_line_entry_content
# Conflicts:
#	FlatCAMDraw.py
2018-05-31 18:00:56 +03:00
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 281a3936eb Merged jpcgt/flatcam into master 2018-05-31 17:28:39 +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 3a5629aa05 - modified the make_win32.py to work with the new Cxfreeze version > 5,
and also for Python3
2018-05-31 01:40:33 +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 5adfeef7fd Merged master into Menu_clening_icons_adding 2018-05-29 17:41:27 +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 30eb600c02 - added ability to add a menu-entry separator after the tool, on install 2018-05-29 17:23:06 +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 e1c8eaafa9 - in TCL Shell removed the line that setFocus after the item is disabled
(this is pointless)
- added separators between groups of menu items
- added icons for the Drawing -> Paint and for the Drawing - > Buffer
- added ability to add icons for the Tools
- added icons to the current tools (Dblsided Tool, Measurement Tool)
- added buttons in the toolbar for: Open Gerber, Open Excellon,
Open Gcode and Save Project As
- added button in Tools toolbar for Measurement tool
- added separators in the toolbar
- organized the toolbar buttons in multiple toolbars that can be disabled
with right click on the toolbar
- added names for the toolbars where they were not present
2018-05-29 16:48:06 +03: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 8938ebf9d0 - added a capability that now, on every click on a line_entry
(the elements from GuiElements.py that require text entry, less
FCTextArea for which it might be unwanted behaior) the content is selected.
This makes easier the edit of values.
2018-05-26 23:11:45 +03:00