Skip to content

Commit 905ecd2

Browse files
authored
Merge pull request #2556 from luzpaz/typos-lib
Fix typos in lib/ subdirectory
2 parents 1bdce3e + f51df27 commit 905ecd2

11 files changed

Lines changed: 19 additions & 19 deletions

File tree

lib/python/gladevcp/offsetwidget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def get_offsets(self):
141141
return g5x,tool,g92,rot
142142

143143
# This does the units conversion
144-
# it just mutiplies the two arrays
144+
# it just multiplies the two arrays
145145
def convert_units(self,v):
146146
c = self.conversion
147147
return list(map(lambda x,y: x*y, v, c))

lib/python/qtvcp/lib/qt_vismach/scara.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# no component made here - reads the pins directly
2323
comp = None
2424

25-
# set mesurement system
25+
# set measurement system
2626
METRIC = 1
2727
IMPERIAL = 25.4
2828
MODEL_SCALING = METRIC

lib/python/qtvcp/lib/ripper/gcode_ripper.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
(It now uses the first Z position in the g-code for the z-safe for probe moves before a z position is specified.)
8383
8484
Version 0.21 - Added option to disable the g-code path display (might speed things up for large g-code files
85-
- Fixed handling of G43 commands with G0 moves mixed in on the same line (whos writes g-code like that anyway...)
85+
- Fixed handling of G43 commands with G0 moves mixed in on the same line (who writes g-code like that anyway...)
8686
- Bounding box now displays when in auto-probe mode
8787
8888
Version 0.22 - Added support for DDCS probing to file
@@ -3435,7 +3435,7 @@ def DoIt(self):
34353435
self.MAXZ=maxz
34363436
self.MINZ=minz
34373437

3438-
# Reset Staus Bar and Entry Fields
3438+
# Reset Status Bar and Entry Fields
34393439

34403440
self.entry_set(self.Entry_GscaleXY, self.Entry_GscaleXY_Check() ,1)
34413441
self.entry_set(self.Entry_GscaleZ, self.Entry_GscaleZ_Check() ,1)
@@ -5482,7 +5482,7 @@ def generate_dxf_write_gcode(self,side,Rapids=True):
54825482
g_code.append("0")
54835483
g_code.append("ENDSEC")
54845484

5485-
#This block section is not necessary but apperantly it's good form to include one anyway.
5485+
#This block section is not necessary but apparently it's good form to include one anyway.
54865486
#The following is an empty block section.
54875487
g_code.append("0")
54885488
g_code.append("SECTION")
@@ -6129,9 +6129,9 @@ def EXPRESSION_EVAL(self,line):
61296129
### While there are still brackets "[...]" keep processing ###
61306130
#################################################################
61316131
while s != -1:
6132-
##############################################################
6133-
### Find the first occurence of "]" after the current "[" ###
6134-
##############################################################
6132+
###############################################################
6133+
### Find the first occurrence of "]" after the current "[" ###
6134+
###############################################################
61356135
e=-1
61366136
for cnt in range(len(line)-1,s,-1):
61376137
if line[cnt] == ']':

lib/python/qtvcp/lib/writer/ext/table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def insert(self):
9696

9797
fmt.setCellSpacing(space)
9898

99-
# Inser the new table
99+
# Insert the new table
100100
cursor.insertTable(rows,cols,fmt)
101101

102102
self.close()

lib/python/qtvcp/plugins/container_plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def icon(self):
8282
return QtGui.QIcon(QtGui.QPixmap(ICON.get_path('jointenablewidget')))
8383

8484
def toolTip(self):
85-
return "Linuxcnc Joint Availablility enable/disable widget"
85+
return "Linuxcnc Joint Availability enable/disable widget"
8686

8787
def whatsThis(self):
8888
return ""

lib/python/qtvcp/qt_action.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ def GET_ABOUT_INFO(self):
853853
# Action Helper functions
854854
######################################
855855

856-
# adjust the jog rate by one aproximate division of the
856+
# adjust the jog rate by one approximate division of the
857857
# min/max range on an exponential scale.
858858
# cut off at the upper and lower jog rates as per the INI
859859
def _step_jograte(self, jograte, minrate, maxrate, inc, divs):

lib/python/qtvcp/widgets/camview_widget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
INFO = Info()
3636
LOG = logger.getLogger(__name__)
3737

38-
# Surpress cryptic messages when chacking for useable ports
38+
# Suppress cryptic messages when checking for useable ports
3939
os.environ["OPENCV_LOG_LEVEL"]="FATAL"
4040

4141
# If the library is missing don't crash the GUI

lib/python/qtvcp/widgets/dialog_widget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def set_geometry(self):
167167
self._geometry_string = self.get_current_geometry()
168168

169169
else:
170-
# assuming geometry is actual size/positon
170+
# assuming geometry is actual size/position
171171
temp = self._geometry_string.split(' ')
172172
self.setGeometry(int(temp[0]), int(temp[1]), int(temp[2]), int(temp[3]))
173173
except Exception as e:

lib/python/qtvcp/widgets/hal_label.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def _hal_init(self):
6161
else:
6262
self.hal_pin.value_changed.connect(lambda data: self._changeText(data))
6363

64-
# display formated text
64+
# display formatted text
6565
def _setText(self, data):
6666
try:
6767
tmpl = lambda s: str(self._textTemplate) % s
@@ -77,7 +77,7 @@ def _changeText(self, data):
7777
self._setText(self._multi_label_list[data])
7878

7979
# one can connect signals to this widget to
80-
# feed an input that gets formated by this widget.
80+
# feed an input that gets formatted by this widget.
8181
@pyqtSlot(float)
8282
@pyqtSlot(int)
8383
@pyqtSlot(bool)

lib/python/qtvcp/widgets/hal_selectionbox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def setSignalTypes(self, \
195195
types = [HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32], \
196196
driven = [True, False]):
197197
''' Sets the pin type: HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32
198-
and what tyoe of signals (driven by a pin, not or both).
198+
and what type of signals (driven by a pin, not or both).
199199
True being driven and False being un-driven signals
200200
combobox.setSignalTypes([combobox.HAL_BIT], direction = [True,False])'''
201201
self.SIGTYPE = types

0 commit comments

Comments
 (0)