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

- working to differentiate between temporary units change and permanent units change

Browse Source
This commit is contained in:
Marius Stanciu
2021-09-27 17:28:54 +03:00
committed by Marius
parent 89426e8ac3
commit 3fc0ab826f
50 changed files with 185 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appObjects/FlatCAMGeometry.py
View File

@@ -141,7 +141,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# self.old_pp_state = self.app.defaults["tools_mill_multidepth"]
# self.old_toolchangeg_state = self.app.defaults["tools_mill_toolchange"]
self.units_found = self.app.defaults['units']
self.units_found = self.app.app_units
# this variable can be updated by the Object that generates the geometry
self.tool_type = 'C1'
@@ -171,7 +171,7 @@ class GeometryObject(FlatCAMObj, Geometry):
FlatCAMObj.build_ui(self)
self.units = self.app.defaults['units']
self.units = self.app.app_units
row_idx = 0
@@ -300,8 +300,8 @@ class GeometryObject(FlatCAMObj, Geometry):
assert isinstance(self.ui, GeometryObjectUI), \
"Expected a GeometryObjectUI, got %s" % type(self.ui)
self.units = self.app.defaults['units'].upper()
self.units_found = self.app.defaults['units']
self.units = self.app.app_units.upper()
self.units_found = self.app.app_units
self.form_fields.update({
"plot": self.ui.plot_cb,
@@ -549,8 +549,8 @@ class GeometryObject(FlatCAMObj, Geometry):
msp = dwg.modelspace()
# add units
dwg.units = ezdxf.InsertUnits(4) if self.app.defaults['units'].lower() == 'mm' else ezdxf.InsertUnits(1)
dwg.header['$MEASUREMENT'] = 1 if self.app.defaults['units'].lower() == 'mm' else 0
dwg.units = ezdxf.InsertUnits(4) if self.app.app_units.lower() == 'mm' else ezdxf.InsertUnits(1)
dwg.header['$MEASUREMENT'] = 1 if self.app.app_units.lower() == 'mm' else 0
def g2dxf(dxf_space, geo_obj):
if isinstance(geo_obj, MultiPolygon):