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

- in Gerber aperture table now the values are displayed in the current units set in FlatCAM

Browse Source
This commit is contained in:
Marius Stanciu
2019-02-14 23:21:20 +02:00
committed by Marius S
parent 8f7d169e9c
commit fa0ee40e90
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FlatCAMObj.py
View File

@@ -498,7 +498,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
sort = []
for k, v in list(self.aperture_macros.items()):
sort.append(int(k))
sort.append(k)
sorted_macros = sorted(sort)
for ap_code in sorted_apertures:
@@ -516,17 +516,25 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
if str(self.apertures[ap_code]['type']) == 'R' or str(self.apertures[ap_code]['type']) == 'O':
ap_dim_item = QtWidgets.QTableWidgetItem(
'%.4f, %.4f' % (self.apertures[ap_code]['width'], self.apertures[ap_code]['height']))
'%.4f, %.4f' % (self.apertures[ap_code]['width'] * self.file_units_factor,
self.apertures[ap_code]['height'] * self.file_units_factor
)
)
ap_dim_item.setFlags(QtCore.Qt.ItemIsEnabled)
elif str(self.apertures[ap_code]['type']) == 'P':
ap_dim_item = QtWidgets.QTableWidgetItem(
'%.4f, %.4f' % (self.apertures[ap_code]['diam'], self.apertures[ap_code]['nVertices']))
'%.4f, %.4f' % (self.apertures[ap_code]['diam'] * self.file_units_factor,
self.apertures[ap_code]['nVertices'] * self.file_units_factor)
)
ap_dim_item.setFlags(QtCore.Qt.ItemIsEnabled)
else:
ap_dim_item = QtWidgets.QTableWidgetItem('')
ap_dim_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_size_item = QtWidgets.QTableWidgetItem('%.4f' % float(self.apertures[ap_code]['size']))
if self.apertures[ap_code]['size'] is not None:
ap_size_item = QtWidgets.QTableWidgetItem('%.4f' %
float(self.apertures[ap_code]['size'] *
self.file_units_factor))
ap_size_item.setFlags(QtCore.Qt.ItemIsEnabled)
plot_item = FCCheckBox()