- fixed a recent but in Gerber Object that crashed the application when the aperture marking was used
This commit is contained in:
@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
|
|||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
20.04.2021
|
||||||
|
|
||||||
|
- fixed a recent but in Gerber Object that crashed the application when the aperture marking was used
|
||||||
|
|
||||||
12.04.2021
|
12.04.2021
|
||||||
|
|
||||||
- small string change
|
- small string change
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ class GerberObject(FlatCAMObj, Gerber):
|
|||||||
self.ui.apertures_table.setRowCount(n)
|
self.ui.apertures_table.setRowCount(n)
|
||||||
|
|
||||||
for ap_code in sorted_apertures:
|
for ap_code in sorted_apertures:
|
||||||
ap_code = str(ap_code)
|
# ap_code = str(ap_code)
|
||||||
|
|
||||||
# ------------------------ Aperture ID ----------------------------------------------------------------
|
# ------------------------ Aperture ID ----------------------------------------------------------------
|
||||||
ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1))
|
ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1))
|
||||||
@@ -279,7 +279,7 @@ class GerberObject(FlatCAMObj, Gerber):
|
|||||||
self.ui.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id
|
self.ui.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id
|
||||||
|
|
||||||
# ------------------------ Aperture CODE --------------------------------------------------------------
|
# ------------------------ Aperture CODE --------------------------------------------------------------
|
||||||
ap_code_item = QtWidgets.QTableWidgetItem(ap_code)
|
ap_code_item = QtWidgets.QTableWidgetItem(str(ap_code))
|
||||||
ap_code_item.setFlags(QtCore.Qt.ItemIsEnabled)
|
ap_code_item.setFlags(QtCore.Qt.ItemIsEnabled)
|
||||||
|
|
||||||
# ------------------------ Aperture TYPE --------------------------------------------------------------
|
# ------------------------ Aperture TYPE --------------------------------------------------------------
|
||||||
@@ -1120,7 +1120,8 @@ class GerberObject(FlatCAMObj, Gerber):
|
|||||||
def clear_plot_apertures(self, aperture='all'):
|
def clear_plot_apertures(self, aperture='all'):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
:param aperture: string; aperture for which to clear the mark shapes
|
:param aperture: aperture for which to clear the mark shapes
|
||||||
|
:type aperture: str, int
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -1161,7 +1162,7 @@ class GerberObject(FlatCAMObj, Gerber):
|
|||||||
self.marked_rows[:] = []
|
self.marked_rows[:] = []
|
||||||
|
|
||||||
try:
|
try:
|
||||||
aperture = self.ui.apertures_table.item(cw_row, 1).text()
|
aperture = int(self.ui.apertures_table.item(cw_row, 1).text())
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
self.ui_connect()
|
self.ui_connect()
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user