Skip to content

Commit 362d5a8

Browse files
committed
qt5_graphics: fix copy/paste errors
1 parent a335936 commit 362d5a8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/emc/usr_intf/gremlin/qt5_graphics.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, inifile):
6969
self.xSlider.setValue(15 * 16)
7070
self.ySlider.setValue(345 * 16)
7171
self.zSlider.setValue(0 * 16)
72-
self.zSlider.setValue(10)
72+
self.zoomSlider.setValue(10)
7373

7474
self.setWindowTitle("Hello GL")
7575

@@ -379,6 +379,7 @@ def load(self,filename = None):
379379
td = tempfile.mkdtemp()
380380
self._current_file = filename
381381
load_result = True
382+
canon = None
382383
try:
383384
random = int(self.inifile.find("EMCIO", "RANDOM_TOOLCHANGER") or 0)
384385
arcdivision = int(self.inifile.find("DISPLAY", "ARCDIVISION") or 64)
@@ -387,7 +388,7 @@ def load(self,filename = None):
387388
self.get_geometry(),
388389
self.foam_option,
389390
self.lathe_option,
390-
s, text, random, i,
391+
s, random, text, i,
391392
progress, arcdivision)
392393
# monkey patched function to call ours
393394
canon.output_notify_message = self.output_notify_message
@@ -1063,7 +1064,7 @@ def set_prime(self, x, y):
10631064
def select_prime(self, x, y):
10641065
self.select_primed = x, y
10651066

1066-
# If the hcode program is large the display pauses plotting update
1067+
# If the hcode program is large the display pauses plotting update
10671068
# while searching. probably needs a thread or compiled code.
10681069
# the actual opengl search is in glcanon.py, GlCanonDraw: select()
10691070
def select_fire(self):
@@ -1223,6 +1224,7 @@ def makeObject(self):
12231224
self.extrude(x3, y3, x4, y4, z= .05, color = self.Green)
12241225
self.extrude(x4, y4, y4, x4, z= .05, color = self.Green)
12251226
self.extrude(y4, x4, y3, x3, z= .05, color = self.Green)
1227+
self.extrude(y3, x3, x3, y3, z= .05, color = self.Green)
12261228

12271229
NumSectors = 200
12281230

0 commit comments

Comments
 (0)