bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

Browse Source
This commit is contained in:
camellan
2019-06-09 19:10:56 +04:00
parent 5a87006869 6cc6d52ebc
commit 4587946b48
11 changed files with 1378 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
FlatCAMApp.py
View File

@@ -1,10 +1,10 @@
# ######################################################### ##
# ###########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# Author: Juan Pablo Caram (c) #
# Date: 2/5/2014 #
# MIT Licence #
# ######################################################### ##
# ###########################################################
import urllib.request, urllib.parse, urllib.error
import getopt
@@ -25,9 +25,9 @@ import gc
from xml.dom.minidom import parseString as parse_xml_string
# ##################################### ##
# # Imports part of FlatCAM # ##
# ##################################### ##
# #######################################
# # Imports part of FlatCAM ##
# #######################################
from ObjectCollection import *
from FlatCAMObj import *
from flatcamGUI.PlotCanvas import *
@@ -681,7 +681,7 @@ class App(QtCore.QObject):
"zoom_out_key": '-',
"zoom_in_key": '=',
"grid_toggle_key": 'G',
"zoom_ratio": 1.5,
"global_zoom_ratio": 1.5,
"global_point_clipboard_format": "(%.4f, %.4f)",
"global_zdownrate": None,
@@ -875,7 +875,7 @@ class App(QtCore.QObject):
"tools_calc_vshape_cut_z": 0.000787,
"tools_calc_electro_length": 10.0,
"tools_calc_electro_width": 10.0,
"tools_calc_electro_cdensity":13.0,
"tools_calc_electro_cdensity": 13.0,
"tools_calc_electro_growth": 10.0,
"tools_transform_rotate": 90,
@@ -929,10 +929,9 @@ class App(QtCore.QObject):
self.ui.general_defaults_form.general_app_group.language_cb.setCurrentText(ret_val)
log.debug("App.__init__() --> Applied %s language." % str(ret_val).capitalize())
# ################################ ##
# # ## CREATE UNIQUE SERIAL NUMBER # ##
# ################################ ##
# ##################################
# ### CREATE UNIQUE SERIAL NUMBER ##
# ##################################
chars = 'abcdefghijklmnopqrstuvwxyz0123456789'
if self.defaults['global_serial'] == 0 or len(str(self.defaults['global_serial'])) < 10:
@@ -1416,9 +1415,20 @@ class App(QtCore.QObject):
self.ui.menuviewdisableall.triggered.connect(self.disable_all_plots)
self.ui.menuviewdisableother.triggered.connect(self.disable_other_plots)
self.ui.menuviewenable.triggered.connect(self.enable_all_plots)
self.ui.menuview_zoom_fit.triggered.connect(self.on_zoom_fit)
<<<<<<< HEAD
self.ui.menuview_zoom_in.triggered.connect(lambda: self.plotcanvas.zoom(1.5))
self.ui.menuview_zoom_out.triggered.connect(lambda: self.plotcanvas.zoom(1 / 1.5))
=======
self.ui.menuview_zoom_in.triggered.connect(
lambda: self.plotcanvas.zoom(1 / float(self.defaults['global_zoom_ratio']))
)
self.ui.menuview_zoom_out.triggered.connect(
lambda: self.plotcanvas.zoom(float(self.defaults['global_zoom_ratio']))
)
>>>>>>> remotes/jpcgt/flatcam/Beta
self.ui.menuview_toggle_code_editor.triggered.connect(self.on_toggle_code_editor)
self.ui.menuview_toggle_fscreen.triggered.connect(self.on_fullscreen)
self.ui.menuview_toggle_parea.triggered.connect(self.on_toggle_plotarea)
@@ -2784,7 +2794,7 @@ class App(QtCore.QObject):
self.inform.emit(_("[ERROR_NOTCL] Failed to parse defaults file."))
return
self.defaults.update(defaults_from_file)
self.inform.emit(_("[success] Imported Defaults from %s") %filename)
self.inform.emit(_("[success] Imported Defaults from %s") % filename)
def on_export_preferences(self):
self.report_usage("on_export_preferences")
@@ -2796,16 +2806,16 @@ class App(QtCore.QObject):
self.date = ''.join(c for c in self.date if c not in ':-')
self.date = self.date.replace(' ', '_')
filter = "Config File (*.FlatConfig);;All Files (*.*)"
filter__ = "Config File (*.FlatConfig);;All Files (*.*)"
try:
filename, _f = QtWidgets.QFileDialog.getSaveFileName(
caption=_("Export FlatCAM Preferences"),
directory=self.data_path + '/preferences_' + self.date,
filter=filter
filter=filter__
)
except TypeError:
filename, _f = QtWidgets.QFileDialog.getSaveFileName(caption=_("Export FlatCAM Preferences"),
filter=filter)
filter=filter__)
filename = str(filename)
defaults_from_file = {}
@@ -3461,11 +3471,11 @@ class App(QtCore.QObject):
# if len(set(geo_type_list)) == 1 means that all list elements are the same
if len(set(geo_type_list)) != 1:
self.inform.emit(_("[ERROR] Failed join. The Geometry objects are of different types.\n"
"At least one is MultiGeo type and the other is SingleGeo type. A possibility is to "
"convert from one to another and retry joining \n"
"but in the case of converting from MultiGeo to SingleGeo, informations may be lost and "
"the result may not be what was expected. \n"
"Check the generated GCODE."))
"At least one is MultiGeo type and the other is SingleGeo type. A possibility is to "
"convert from one to another and retry joining \n"
"but in the case of converting from MultiGeo to SingleGeo, informations may be lost and "
"the result may not be what was expected. \n"
"Check the generated GCODE."))
return
# if at least one True object is in the list then due of the previous check, all list elements are True objects