jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

axis.py restore redraw_dro()

Browse source 
History:
1) commit b2855e46 (Apr 2016) modified axis.py:redraw_dro()
   to remove items of the dro display tab as part
   of extensive JA work of that time:
    "axis.py: abandon DRO tab home&limit indicators JA"

2) commit 3b0eb77 was merged to the master branch
   when incorporating reverse run functionality.
   This commit claims whitespace only changes to axis.py:
      "axis: whitespace only"
   However, the fix of merge conflicts:
      "EDIT: fix merge conflicts 12 Dec 2018"
   inadvertently restored some obsoleted code
   in redraw_dro().
   The obsoleted code predates b2855e46 probably
   indicating that the reverse run branch
   had not been updated for the redraw_dro() changes
   making for a confusing merge.

3) This commit restores axis.py:redraw_dro() to agree
   with current 2.8 branch (at commit 36820175f)
This commit is contained in:
Dewey Garrett 2019-09-09 09:56:20 -07:00
parent 8e17de8f63
commit 08ec94fa8d
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/emc/usr_intf/axis/scripts/axis.py
View file

@ -603,18 +603,6 @@ class MyOpengl(GlCanonDraw, Opengl):
text.delete("0.0", "end") text.delete("0.0", "end")
t = droposstrs[:] t = droposstrs[:]
i = 0
for ts in t:
if i < len(homed) and homed[i]:
t[i] += "*"
else:
t[i] += " "
if i < len(homed) and limit[i]:
t[i] += "!" # !!!1!
else:
t[i] += " "
i+=1
text.insert("end", "\n".join(t)) text.insert("end", "\n".join(t))
window_height = text.winfo_height() window_height = text.winfo_height()