- fixed the ToolMeasurement geometry not being displayed
This commit is contained in:
parent
a2bef40097
commit
161dbdcb2d
|
@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
- changed the icon for Open Script and reused it for the Check Rules Tool
|
- changed the icon for Open Script and reused it for the Check Rules Tool
|
||||||
- added a new tool named "Optimal Tool" which will determine the minimum distance between the copper features for a Gerber object, in fact determining the maximum diameter for a isolation tool that can be used for a complete isolation
|
- added a new tool named "Optimal Tool" which will determine the minimum distance between the copper features for a Gerber object, in fact determining the maximum diameter for a isolation tool that can be used for a complete isolation
|
||||||
|
- fixed the ToolMeasurement geometry not being displayed
|
||||||
|
|
||||||
27.09.2019
|
27.09.2019
|
||||||
|
|
||||||
|
|
|
@ -237,7 +237,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||||
self.menufile.addAction(self.menufile_exit)
|
self.menufile.addAction(self.menufile_exit)
|
||||||
|
|
||||||
# ## Edit # ##
|
# ## Edit # ##
|
||||||
self.menuedit = self.menu.addMenu(_('&Edit'))
|
self.menuedit = self.menu.addMenu(_('Edit'))
|
||||||
# Separator
|
# Separator
|
||||||
self.menuedit.addSeparator()
|
self.menuedit.addSeparator()
|
||||||
self.menueditedit = self.menuedit.addAction(QtGui.QIcon('share/edit16.png'), _('Edit Object\tE'))
|
self.menueditedit = self.menuedit.addAction(QtGui.QIcon('share/edit16.png'), _('Edit Object\tE'))
|
||||||
|
@ -315,7 +315,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||||
self.menueditpreferences = self.menuedit.addAction(QtGui.QIcon('share/pref.png'), _('&Preferences\tSHIFT+P'))
|
self.menueditpreferences = self.menuedit.addAction(QtGui.QIcon('share/pref.png'), _('&Preferences\tSHIFT+P'))
|
||||||
|
|
||||||
# ## Options # ##
|
# ## Options # ##
|
||||||
self.menuoptions = self.menu.addMenu(_('&Options'))
|
self.menuoptions = self.menu.addMenu(_('Options'))
|
||||||
# self.menuoptions_transfer = self.menuoptions.addMenu(QtGui.QIcon('share/transfer.png'), 'Transfer options')
|
# self.menuoptions_transfer = self.menuoptions.addMenu(QtGui.QIcon('share/transfer.png'), 'Transfer options')
|
||||||
# self.menuoptions_transfer_a2p = self.menuoptions_transfer.addAction("Application to Project")
|
# self.menuoptions_transfer_a2p = self.menuoptions_transfer.addAction("Application to Project")
|
||||||
# self.menuoptions_transfer_p2a = self.menuoptions_transfer.addAction("Project to Application")
|
# self.menuoptions_transfer_p2a = self.menuoptions_transfer.addAction("Project to Application")
|
||||||
|
@ -2397,6 +2397,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||||
self.app.on_skewy()
|
self.app.on_skewy()
|
||||||
return
|
return
|
||||||
elif modifiers == QtCore.Qt.AltModifier:
|
elif modifiers == QtCore.Qt.AltModifier:
|
||||||
|
|
||||||
# Eanble all plots
|
# Eanble all plots
|
||||||
if key == Qt.Key_1:
|
if key == Qt.Key_1:
|
||||||
self.app.enable_all_plots()
|
self.app.enable_all_plots()
|
||||||
|
|
|
@ -380,7 +380,7 @@ class Measurement(FlatCAMTool):
|
||||||
# second draw the new shape of the utility geometry
|
# second draw the new shape of the utility geometry
|
||||||
meas_line = LineString([pos, self.points[0]])
|
meas_line = LineString([pos, self.points[0]])
|
||||||
|
|
||||||
color = '#00000000'
|
color = '#000000FF'
|
||||||
self.sel_shapes.add(meas_line, color=color, update=True, layer=0, tolerance=None)
|
self.sel_shapes.add(meas_line, color=color, update=True, layer=0, tolerance=None)
|
||||||
|
|
||||||
if self.app.is_legacy is True:
|
if self.app.is_legacy is True:
|
||||||
|
|
Loading…
Reference in New Issue