Skip to content

Commit ecdea1a

Browse files
hansuhansu
authored
Merge pull request #1871 from luzpaz/typos/lib-python
lib/python: fix various typos
2 parents 8491a4c + 09a439a commit ecdea1a

File tree

14 files changed

+35
-35
lines changed

14 files changed

+35
-35
lines changed

‎lib/python/gladevcp/builtin-panels/versa-probe/versa_probe_screen.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import hal_glib # needed to make our own hal pins
2323
import gtk.glade
2424
import sys # handle system calls
25-
import linuxcnc # to get our own error sytsem
25+
import linuxcnc # to get our own error system
2626
import gladevcp
2727
import time
2828
import math
@@ -560,7 +560,7 @@ def on_xp_released(self, gtkbutton, data = None):
560560
# move Z to start point up
561561
if self.z_clearance_up() == -1:
562562
return
563-
# move to finded point
563+
# move to found point
564564
s = "G1 X%f" % xres
565565
if self.gcode(s) == -1:
566566
return
@@ -589,7 +589,7 @@ def on_yp_released(self, gtkbutton, data = None):
589589
# move Z to start point up
590590
if self.z_clearance_up() == -1:
591591
return
592-
# move to finded point
592+
# move to found point
593593
s = "G1 Y%f" % yres
594594
if self.gcode(s) == -1:
595595
return
@@ -618,7 +618,7 @@ def on_xm_released(self, gtkbutton, data = None):
618618
# move Z to start point up
619619
if self.z_clearance_up() == -1:
620620
return
621-
# move to finded point
621+
# move to found point
622622
s = "G1 X%f" % xres
623623
if self.gcode(s) == -1:
624624
return
@@ -647,7 +647,7 @@ def on_ym_released(self, gtkbutton, data = None):
647647
# move Z to start point up
648648
if self.z_clearance_up() == -1:
649649
return
650-
# move to finded point
650+
# move to found point
651651
s = "G1 Y%f" % yres
652652
if self.gcode(s) == -1:
653653
return
@@ -700,7 +700,7 @@ def on_xpyp_released(self, gtkbutton, data = None):
700700
# move Z to start point up
701701
if self.z_clearance_up() == -1:
702702
return
703-
# move to finded point
703+
# move to found point
704704
s = "G1 X%f Y%f" % (xres,yres)
705705
if self.gcode(s) == -1:
706706
return
@@ -750,7 +750,7 @@ def on_xpym_released(self, gtkbutton, data = None):
750750
# move Z to start point up
751751
if self.z_clearance_up() == -1:
752752
return
753-
# move to finded point
753+
# move to found point
754754
s = "G1 X%f Y%f" % (xres,yres)
755755
if self.gcode(s) == -1:
756756
return
@@ -801,7 +801,7 @@ def on_xmyp_released(self, gtkbutton, data = None):
801801
# move Z to start point up
802802
if self.z_clearance_up() == -1:
803803
return
804-
# move to finded point
804+
# move to found point
805805
s = "G1 X%f Y%f" % (xres,yres)
806806
if self.gcode(s) == -1:
807807
return
@@ -852,7 +852,7 @@ def on_xmym_released(self, gtkbutton, data = None):
852852
# move Z to start point up
853853
if self.z_clearance_up() == -1:
854854
return
855-
# move to finded point
855+
# move to found point
856856
s = "G1 X%f Y%f" % (xres,yres)
857857
if self.gcode(s) == -1:
858858
return
@@ -949,7 +949,7 @@ def on_xy_center_released(self, gtkbutton, data = None):
949949
ymres=float(a[1])-0.5*self.spbtn1_probe_diam.get_value()
950950
self.lb_probe_ym.set_text( "%.4f" % ymres )
951951
self.lenght_y()
952-
# find, show and move to finded point
952+
# find, show and move to found point
953953
ycres=0.5*(ypres+ymres)
954954
self.lb_probe_yc.set_text( "%.4f" % ycres )
955955
diam=0.5*((xmres-xpres)+(ymres-ypres))
@@ -958,7 +958,7 @@ def on_xy_center_released(self, gtkbutton, data = None):
958958
# move Z to start point up
959959
if self.z_clearance_up() == -1:
960960
return
961-
# move to finded point
961+
# move to found point
962962
s = "G1 Y%f" % ycres
963963
if self.gcode(s) == -1:
964964
return
@@ -1010,7 +1010,7 @@ def on_xpyp1_released(self, gtkbutton, data = None):
10101010
# move Z to start point
10111011
if self.z_clearance_up() == -1:
10121012
return
1013-
# move to finded point
1013+
# move to found point
10141014
s = "G1 X%f Y%f" % (xres,yres)
10151015
if self.gcode(s) == -1:
10161016
return
@@ -1056,7 +1056,7 @@ def on_xpym1_released(self, gtkbutton, data = None):
10561056
# move Z to start point
10571057
if self.z_clearance_up() == -1:
10581058
return
1059-
# move to finded point
1059+
# move to found point
10601060
s = "G1 X%f Y%f" % (xres,yres)
10611061
if self.gcode(s) == -1:
10621062
return
@@ -1103,7 +1103,7 @@ def on_xmyp1_released(self, gtkbutton, data = None):
11031103
# move Z to start point
11041104
if self.z_clearance_up() == -1:
11051105
return
1106-
# move to finded point
1106+
# move to found point
11071107
s = "G1 X%f Y%f" % (xres,yres)
11081108
if self.gcode(s) == -1:
11091109
return
@@ -1149,7 +1149,7 @@ def on_xmym1_released(self, gtkbutton, data = None):
11491149
# move Z to start point
11501150
if self.z_clearance_up() == -1:
11511151
return
1152-
# move to finded point
1152+
# move to found point
11531153
s = "G1 X%f Y%f" % (xres,yres)
11541154
if self.gcode(s) == -1:
11551155
return
@@ -1229,7 +1229,7 @@ def on_xy_hole_released(self, gtkbutton, data = None):
12291229
ypres=float(a[1])+0.5*self.spbtn1_probe_diam.get_value()
12301230
self.lb_probe_yp.set_text( "%.4f" % ypres )
12311231
self.lenght_y()
1232-
# find, show and move to finded point
1232+
# find, show and move to found point
12331233
ycres=0.5*(ymres+ypres)
12341234
self.lb_probe_yc.set_text( "%.4f" % ycres )
12351235
diam=0.5*((xpres-xmres)+(ypres-ymres))

‎lib/python/gladevcp/offsetpage_widget.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def system_to_p(system):
343343
else:
344344
tmpl = lambda s: self.imperial_text_template % s
345345

346-
# allow 'name' columnn text to be arbitrarily changed
346+
# allow 'name' column text to be arbitrarily changed
347347
if col == 10:
348348
self.store[row][14] = new_text
349349
return

‎lib/python/gladevcp/speedcontrol.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class SpeedControl(Gtk.VBox, _HalSpeedControlBase):
5656
allowed values are 0.001, 99999.0
5757
default is 100.0
5858
increment = float : sets the applied increment per mouse click,
59-
-1 means 100 increments fom min to max
59+
-1 means 100 increments from min to max
6060
inc_speed = integer : Sets the timer delay for the increment speed holding pressed the buttons
6161
allowed values are 20 to 300
6262
default is 100

‎lib/python/gladevcp/xembed.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
# vim: sts=4 sw=4 et
33
"""
4-
XEmbed helper functions to allow correct embeding inside Axis
4+
XEmbed helper functions to allow correct embedding inside Axis
55
"""
66

77
import gi

‎lib/python/plasmac/sector.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ def preview(Conv, fTmp, fNgc, fNgcBkp, \
7878
if error:
7979
return error
8080
if radius == 0:
81-
msg = _('RADIUS canot be zero')
81+
msg = _('RADIUS cannot be zero')
8282
error += '{}\n\n'.format(msg)
8383
if sAngle == 0:
84-
msg = _('SEC ANGLE canot be zero')
84+
msg = _('SEC ANGLE cannot be zero')
8585
error += '{}\n\n'.format(msg)
8686
if error:
8787
return error

‎lib/python/pyngcgui.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ def find_positional_parms(s):
391391
dvalue = int(dvalue)
392392
if r.group(4): comment = r.group(4)
393393
if n > 4:
394-
print('find_positional_parametrs unexpected n>4',s,)
394+
print('find_positional_parameters unexpected n>4',s,)
395395
comment = r.group(4)
396396
if comment is None:
397397
print('find_positional_parameters:NOCOMMENT') # can't happen
@@ -3357,7 +3357,7 @@ def __init__(self,mypg,pre_info,sub_info,pst_info,force_expand=False):
33573357
# example: 246 chars observed for
33583358
# qpex --> the call to qpocket uses many named parms
33593359
# hardcoded for # config.h.in #define LINELEN 255
3360-
# hardcoded 252 empiracally determined
3360+
# hardcoded 252 empirically determined
33613361
if len(theline) >= 252:
33623362
theline = line
33633363
self.sdata.append(theline)

‎lib/python/qtvcp/lib/message.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ def callreturn(dialog, btn, pinname):
222222

223223
dialoge = LcncDialog()
224224
e = QPushButton(w)
225-
e.setText("Show critical\n persistant message!")
225+
e.setText("Show critical\n persistent message!")
226226
e.move(10, 120)
227-
e.clicked.connect(lambda data: m.showDialog(dialoge, 'This is a Critical persistant message',
227+
e.clicked.connect(lambda data: m.showDialog(dialoge, 'This is a Critical persistent message',
228228
details='There seems to be something wrong\n You must fix it to clear message', icon=m.CRITICAL,
229229
display_type=LcncDialog.NONE,return_callback = callreturn, nblock=True))
230230

‎lib/python/qtvcp/lib/qt_ngcgui/ngcgui.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def read_ngc(self):
277277
self.flag_error("Parm {} exceeds maximum limit of {}".format(pparm, self.g_max_parm))
278278
self.min_num = min
279279
self.max_num = max
280-
# blanks required for this, use original line not tranlated line
280+
# blanks required for this, use original line not translated line
281281
name, pnum, dvalue, comment = find_positional_parms(orig_line)
282282
if name:
283283
self.ndict[pnum] = (name, dvalue, comment)
@@ -742,13 +742,13 @@ def write_to_file(self, fname, pg, featurect, features_total):
742742
return(ct)
743743

744744
def warp_info_frame(self, newLayout):
745-
""" Convience function to move the info frame to another layout"""
745+
""" Convenience function to move the info frame to another layout"""
746746
newLayout.addWidget(self.frame_info)
747747
# is this enough?
748748
self.frame_info.setMaximumWidth(500)
749749

750750
def warp_tabs_frame(self, newLayout):
751-
""" Convience function to move the tabs frame to another layout"""
751+
""" Convenience function to move the tabs frame to another layout"""
752752
newLayout.addWidget(self.frame_tabs)
753753

754754
##################

‎lib/python/qtvcp/lib/toolbar_actions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ def loadRecent(w):
694694
return
695695

696696
# are we past 5 files? remove the lowest
697-
# else update cuurrent number
697+
# else update current number
698698
if self.recentNum > self.maxRecent:
699699
widget.removeAction(alist[self.maxRecent])
700700
else:

‎lib/python/qtvcp/plugins/actionbutton_plugin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ def buildtab2(self):
689689
self.diam = QtWidgets.QWidget()
690690
hbox = QtWidgets.QHBoxLayout()
691691
hbox.setContentsMargins(0, 0, 0, 0)
692-
label = QtWidgets.QLabel('Round Diamter')
692+
label = QtWidgets.QLabel('Round Diameter')
693693
self.diamSpinBox = QtWidgets.QDoubleSpinBox()
694694
self.diamSpinBox.setRange(2, 100)
695695
self.diamSpinBox.setDecimals(1)
@@ -1108,7 +1108,7 @@ def updateWidget(self):
11081108
# set widget option
11091109
formWindow.cursor().setProperty(winProperty + '_action',
11101110
QtCore.QVariant(True))
1111-
# set status data fom combo box
1111+
# set status data from combo box
11121112
# we read all data from combo and set each property to its
11131113
# current dialog state (ie. selected is true, all others false)
11141114
for i in range(1, self.statusCombo.count()):

0 commit comments

Comments
 (0)