- wip
This commit is contained in:
parent
08e740d45b
commit
e96129b5d1
|
@ -4232,10 +4232,13 @@ class App(QtCore.QObject):
|
||||||
}
|
}
|
||||||
|
|
||||||
App.log.debug("Calling object constructor...")
|
App.log.debug("Calling object constructor...")
|
||||||
|
|
||||||
|
# Object creation/instantiation
|
||||||
obj = classdict[kind](name)
|
obj = classdict[kind](name)
|
||||||
|
|
||||||
obj.units = self.options["units"] # TODO: The constructor should look at defaults.
|
obj.units = self.options["units"] # TODO: The constructor should look at defaults.
|
||||||
|
|
||||||
# Set options from "Project options" form
|
# Update the object options from "Project options" form
|
||||||
self.options_read_form()
|
self.options_read_form()
|
||||||
|
|
||||||
# IMPORTANT
|
# IMPORTANT
|
||||||
|
@ -4517,7 +4520,7 @@ class App(QtCore.QObject):
|
||||||
def options_read_form(self):
|
def options_read_form(self):
|
||||||
"""
|
"""
|
||||||
Same as it's equivalent from the defaults.
|
Same as it's equivalent from the defaults.
|
||||||
self.options use to store the preferences per project. No longer used.
|
self.options used to store the preferences per project. No longer used.
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
for option in self.options_form_fields:
|
for option in self.options_form_fields:
|
||||||
|
|
|
@ -5101,7 +5101,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
"""
|
"""
|
||||||
Only used for TCL Command.
|
Only used for TCL Command.
|
||||||
Creates a CNCJob out of this Geometry object. The actual
|
Creates a CNCJob out of this Geometry object. The actual
|
||||||
work is done by the target FlatCAMCNCjob object's
|
work is done by the target camlib.CNCjob
|
||||||
`generate_from_geometry_2()` method.
|
`generate_from_geometry_2()` method.
|
||||||
|
|
||||||
:param z_cut: Cut depth (negative)
|
:param z_cut: Cut depth (negative)
|
||||||
|
@ -5185,7 +5185,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
except ValueError:
|
except ValueError:
|
||||||
# try to convert comma to decimal point. if it's still not working error message and return
|
# try to convert comma to decimal point. if it's still not working error message and return
|
||||||
try:
|
try:
|
||||||
job_obj.feedrate_rapid = float(self.options["feedrate_probe"].replace(',', '.'))
|
job_obj.feedrate_probe = float(self.options["feedrate_probe"].replace(',', '.'))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
self.app.inform.emit('[ERROR_NOTCL] %s' %
|
self.app.inform.emit('[ERROR_NOTCL] %s' %
|
||||||
_('Wrong value format for self.defaults["feedrate_probe"] '
|
_('Wrong value format for self.defaults["feedrate_probe"] '
|
||||||
|
|
|
@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
4.11.2019
|
||||||
|
|
||||||
|
- wip
|
||||||
|
|
||||||
3.11.2019
|
3.11.2019
|
||||||
|
|
||||||
- fixed the V-shape tool diameter calculation in NCC Tool
|
- fixed the V-shape tool diameter calculation in NCC Tool
|
||||||
|
@ -27,7 +31,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
28.10.2019
|
28.10.2019
|
||||||
|
|
||||||
- in Tools: Paint, NCC and Copper Fill, when using the Area Selection, now the selected aras will stay drawn as markers until the user click RMB
|
- in Tools: Paint, NCC and Copper Fill, when using the Area Selection, now the selected areas will stay drawn as markers until the user click RMB
|
||||||
- in legacy2D graphic engine, adding an utility geometry no longer draw the older ones, overwriting them
|
- in legacy2D graphic engine, adding an utility geometry no longer draw the older ones, overwriting them
|
||||||
- fixed some issues in the Gerber Editor (Aperture add was double adding an aperture)
|
- fixed some issues in the Gerber Editor (Aperture add was double adding an aperture)
|
||||||
- converted Gerber Editor to usage of SpinBoxes
|
- converted Gerber Editor to usage of SpinBoxes
|
||||||
|
|
Loading…
Reference in New Issue