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

- now the verbose log parameter from the Preferences can take 3 values (0, 1, 2). Value = 0 means that the logging is disabled (mostly), value = 1 means that the logging is only in console and value = 3 means that the logging is now displayed in the Tcl box

Browse Source
This commit is contained in:
Marius Stanciu
2022-01-31 01:25:30 +02:00
committed by Marius
parent 33897e8e83
commit fa25644f8f
8 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
appObjects/FlatCAMGerber.py
View File

@@ -118,7 +118,7 @@ class GerberObject(FlatCAMObj, Gerber):
:return: None
"""
FlatCAMObj.set_ui(self, ui)
log.debug("GerberObject.set_ui()")
self.app.log.debug("GerberObject.set_ui()")
self.units = self.app.app_units.upper()
@@ -910,7 +910,7 @@ class GerberObject(FlatCAMObj, Gerber):
:param kwargs: Color and face_color, visible
:return:
"""
log.debug(str(inspect.stack()[1][3]) + " --> GerberObject.plot()")
self.app.log.debug(str(inspect.stack()[1][3]) + " --> GerberObject.plot()")
# Does all the required setup and returns False
# if the 'ptint' option is set to False.
@@ -1666,8 +1666,7 @@ class GerberObject(FlatCAMObj, Gerber):
return gerber_code
@staticmethod
def merge(grb_list, grb_final):
def merge(self, grb_list, grb_final):
"""
Merges the geometry of objects in geo_list into
the geometry of geo_final.
@@ -1699,7 +1698,7 @@ class GerberObject(FlatCAMObj, Gerber):
try:
grb_final.options[option] = grb.options[option]
except KeyError:
log.warning("Failed to copy option.", option)
self.app.log.warning("Failed to copy option.", option)
try:
for geos in grb.solid_geometry:

29
appObjects/FlatCAMObj.py
View File

@@ -151,9 +151,9 @@ class FlatCAMObj(QtCore.QObject):
try:
setattr(self, attr, d[attr])
except KeyError:
log.debug("FlatCAMObj.from_dict() --> KeyError: %s. "
"Means that we are loading an old project that don't"
"have all attributes in the latest application version." % str(attr))
self.app.log.debug("FlatCAMObj.from_dict() --> KeyError: %s. "
"Means that we are loading an old project that don't"
"have all attributes in the latest application version." % str(attr))
pass
def on_options_change(self, key):
@@ -220,7 +220,7 @@ class FlatCAMObj(QtCore.QObject):
@visible.setter
def visible(self, value, threaded=True):
log.debug("FlatCAMObj.visible()")
self.app.log.debug("FlatCAMObj.visible()")
# self.shapes.enabled = not self.shapes.enabled
@@ -300,7 +300,7 @@ class FlatCAMObj(QtCore.QObject):
"""
self.muted_ui = True
log.debug(str(inspect.stack()[1][3]) + "--> FlatCAMObj.build_ui()")
self.app.log.debug(str(inspect.stack()[1][3]) + "--> FlatCAMObj.build_ui()")
try:
# HACK: disconnect the scale entry signal since on focus out event will trigger an undesired scale()
@@ -336,7 +336,8 @@ class FlatCAMObj(QtCore.QObject):
self.app.shell._edit.set_model_data(self.app.myKeywords)
self.app.ui.code_editor.set_model_data(self.app.myKeywords)
except Exception:
log.debug("on_name_activate() --> Could not remove the old object name from auto-completer model list")
self.app.log.debug(
"on_name_activate() --> Could not remove the old object name from auto-completer model list")
self.options["name"] = self.ui.name_entry.get_value()
self.default_data["name"] = self.ui.name_entry.get_value()
@@ -369,7 +370,7 @@ class FlatCAMObj(QtCore.QObject):
factor = float(self.ui.scale_entry.get_value())
except Exception as e:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Scaling could not be executed."))
log.error("FlatCAMObj.on_scale_button_click() -- %s" % str(e))
self.app.log.error("FlatCAMObj.on_scale_button_click() -- %s" % str(e))
return
if type(factor) != float:
@@ -380,7 +381,7 @@ class FlatCAMObj(QtCore.QObject):
self.app.inform.emit('[success] %s' % _("Scale done."))
return
log.debug("FlatCAMObj.on_scale_button_click()")
self.app.log.debug("FlatCAMObj.on_scale_button_click()")
def worker_task():
with self.app.proc_container.new(_("Scaling...")):
@@ -416,7 +417,7 @@ class FlatCAMObj(QtCore.QObject):
:return: None
"""
log.debug(str(inspect.stack()[1][3]) + " --> FlatCAMObj.to_form()")
self.app.log.debug(str(inspect.stack()[1][3]) + " --> FlatCAMObj.to_form()")
for option in self.options:
try:
self.set_form_item(option)
@@ -430,7 +431,7 @@ class FlatCAMObj(QtCore.QObject):
:return: None
:rtype: None
"""
log.debug(str(inspect.stack()[1][3]) + "--> FlatCAMObj.read_form()")
self.app.log.debug(str(inspect.stack()[1][3]) + "--> FlatCAMObj.read_form()")
for option in self.options:
try:
self.read_form_item(option)
@@ -579,7 +580,7 @@ class FlatCAMObj(QtCore.QObject):
length = abs(xmax - xmin)
width = abs(ymax - ymin)
except Exception as ee:
log.error("FlatCAMObj.add_properties_items() -> calculate dimensions --> %s" % str(ee))
self.app.log.error("FlatCAMObj.add_properties_items() -> calculate dimensions --> %s" % str(ee))
# calculate box area
if self.app.app_units.lower() == 'mm':
@@ -611,7 +612,7 @@ class FlatCAMObj(QtCore.QObject):
xmax.append(x1)
ymax.append(y1)
except Exception as ee:
log.error("FlatCAMObj.add_properties_items() cncjob --> %s" % str(ee))
self.app.log.error("FlatCAMObj.add_properties_items() cncjob --> %s" % str(ee))
else:
try:
if obj_prop.tools:
@@ -626,7 +627,7 @@ class FlatCAMObj(QtCore.QObject):
xmax.append(x1)
ymax.append(y1)
except Exception as ee:
log.error("FlatCAMObj.add_properties_items() not cncjob tools --> %s" % str(ee))
self.app.log.error("FlatCAMObj.add_properties_items() not cncjob tools --> %s" % str(ee))
if xmin and ymin and xmax and ymax:
xmin = min(xmin)
@@ -687,7 +688,7 @@ class FlatCAMObj(QtCore.QObject):
area_chull = max(area_chull_list)
except Exception as er:
area_chull = None
log.error("FlatCAMObj.add_properties_items() area chull--> %s" % str(er))
self.app.log.error("FlatCAMObj.add_properties_items() area chull--> %s" % str(er))
if self.app.app_units.lower() == 'mm' and area_chull:
area_chull = area_chull / 100