- fixed an issue in the FlatCAMObj.FlatCAMGerber.convert_units() which needed to be updated after changes elsewhere
This commit is contained in:
parent
eafa6350b7
commit
dfbd4452a1
|
@ -1426,8 +1426,8 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
|
||||||
|
|
||||||
factor = Gerber.convert_units(self, units)
|
factor = Gerber.convert_units(self, units)
|
||||||
|
|
||||||
self.options['isotooldia'] = float(self.options['isotooldia']) * factor
|
# self.options['isotooldia'] = float(self.options['isotooldia']) * factor
|
||||||
self.options['bboxmargin'] = float(self.options['bboxmargin']) * factor
|
# self.options['bboxmargin'] = float(self.options['bboxmargin']) * factor
|
||||||
|
|
||||||
def plot(self, **kwargs):
|
def plot(self, **kwargs):
|
||||||
"""
|
"""
|
||||||
|
@ -3139,6 +3139,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
|
||||||
log.debug("FlatCAMObj.FlatCAMExcellon.convert_units()")
|
log.debug("FlatCAMObj.FlatCAMExcellon.convert_units()")
|
||||||
|
|
||||||
factor = Excellon.convert_units(self, units)
|
factor = Excellon.convert_units(self, units)
|
||||||
|
|
||||||
self.options['drillz'] = float(self.options['drillz']) * factor
|
self.options['drillz'] = float(self.options['drillz']) * factor
|
||||||
self.options['travelz'] = float(self.options['travelz']) * factor
|
self.options['travelz'] = float(self.options['travelz']) * factor
|
||||||
self.options['feedrate'] = float(self.options['feedrate']) * factor
|
self.options['feedrate'] = float(self.options['feedrate']) * factor
|
||||||
|
|
|
@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
- trying to improve the performance of View CNC Code command by using QPlainTextEdit; made the mods for it
|
- trying to improve the performance of View CNC Code command by using QPlainTextEdit; made the mods for it
|
||||||
- when using the Find function in the TextEditor and the result reach the bottom of the document, the next find will be the first in the document (before it defaulted to the beginning of the document)
|
- when using the Find function in the TextEditor and the result reach the bottom of the document, the next find will be the first in the document (before it defaulted to the beginning of the document)
|
||||||
- finished improving the show of text files in FlatCAM (CNC Code, Source files)
|
- finished improving the show of text files in FlatCAM (CNC Code, Source files)
|
||||||
|
- fixed an issue in the FlatCAMObj.FlatCAMGerber.convert_units() which needed to be updated after changes elsewhere
|
||||||
|
|
||||||
12.11.2019
|
12.11.2019
|
||||||
|
|
||||||
|
|
|
@ -1607,7 +1607,7 @@ class Gerber(Geometry):
|
||||||
"""
|
"""
|
||||||
Converts the units of the object to ``units`` by scaling all
|
Converts the units of the object to ``units`` by scaling all
|
||||||
the geometry appropriately. This call ``scale()``. Don't call
|
the geometry appropriately. This call ``scale()``. Don't call
|
||||||
it again in descendents.
|
it again in descendants.
|
||||||
|
|
||||||
:param units: "IN" or "MM"
|
:param units: "IN" or "MM"
|
||||||
:type units: str
|
:type units: str
|
||||||
|
|
Loading…
Reference in New Issue