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

- fixed issues in units conversion

Browse Source 
- in CNCJob UI Autolevelling - changed how the probing code is generated and when
- changed some strings in CNCJob UI Autolevelling
This commit is contained in:
Marius Stanciu
2020-08-24 00:51:07 +03:00
parent 3430d86dba
commit 01df27f45f
7 changed files with 182 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appGUI/GUIElements.py
View File

@@ -694,7 +694,7 @@ class NumericalEvalTupleEntry(EvalEntry):
def __init__(self, border_color=None):
super().__init__(border_color=border_color)
regex = QtCore.QRegExp("[0-9\/\*\+\-\%\.\s\,]*")
regex = QtCore.QRegExp("[0-9\/\*\+\-\%\.\s\,\[\]]*")
validator = QtGui.QRegExpValidator(regex, self)
self.setValidator(validator)

6
appGUI/ObjectUI.py
View File

@@ -2363,15 +2363,15 @@ class CNCObjectUI(ObjectUI):
# #############################################################################################################
height_lay = QtWidgets.QHBoxLayout()
self.h_gcode_button = FCButton(_("Generate Height Map GCode"))
self.h_gcode_button = FCButton(_("Save Probing GCode"))
self.h_gcode_button.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
height_lay.addWidget(self.h_gcode_button)
self.view_h_gcode_button = QtWidgets.QToolButton()
self.view_h_gcode_button.setIcon(QtGui.QIcon(self.app.resource_location + '/find32.png'))
self.view_h_gcode_button.setIcon(QtGui.QIcon(self.app.resource_location + '/edit_file32.png'))
# self.view_h_gcode_button.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored)
self.view_h_gcode_button.setToolTip(
_("View the probing GCode.")
_("View/Edit the probing GCode.")
)
# height_lay.addStretch()
height_lay.addWidget(self.view_h_gcode_button)