From e96129b5d18046e933d01e008fef4a8ac46a73cd Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 4 Nov 2019 21:28:11 +0200 Subject: [PATCH] - wip --- FlatCAMApp.py | 7 +++++-- FlatCAMObj.py | 4 ++-- README.md | 6 +++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 3a3dd384..f2309d33 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -4232,10 +4232,13 @@ class App(QtCore.QObject): } App.log.debug("Calling object constructor...") + + # Object creation/instantiation obj = classdict[kind](name) + 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() # IMPORTANT @@ -4517,7 +4520,7 @@ class App(QtCore.QObject): def options_read_form(self): """ 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 """ for option in self.options_form_fields: diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 0c9eb663..0782c01e 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -5101,7 +5101,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): """ Only used for TCL Command. 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. :param z_cut: Cut depth (negative) @@ -5185,7 +5185,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: # try to convert comma to decimal point. if it's still not working error message and return try: - job_obj.feedrate_rapid = float(self.options["feedrate_probe"].replace(',', '.')) + job_obj.feedrate_probe = float(self.options["feedrate_probe"].replace(',', '.')) except ValueError: self.app.inform.emit('[ERROR_NOTCL] %s' % _('Wrong value format for self.defaults["feedrate_probe"] ' diff --git a/README.md b/README.md index 930fa9ed..ebc9ef26 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +4.11.2019 + +- wip + 3.11.2019 - 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 -- 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 - fixed some issues in the Gerber Editor (Aperture add was double adding an aperture) - converted Gerber Editor to usage of SpinBoxes