axis: Tool pointer not shown in master

[hdiethelm]

2.9:

master:

[andypugh]

Possibly caused by
4a22a67
I had a bit of trouble merging this due to conflict with the new INI parser changes.
@BsAtHome can you take a look at:
https://github.com/LinuxCNC/linuxcnc/blob/master/lib/python/rs274/glcanon.py#L571
Possibly I misunderstood "fallback"

[BsAtHome]

can you take a look at: https://github.com/LinuxCNC/linuxcnc/blob/master/lib/python/rs274/glcanon.py#L571 Possibly I misunderstood "fallback"

You refer to this line:

self.tool_min_dia = self.inifile.getreal("DISPLAY", "GCODE_VIEW_TOOL_MIN_DIA", fallback=0.0)

When [DISPLAY]GCODE_VIEW_TOOL_MIN_DIA is invalid or not set, then it returns the fallback value of 0.0.

The problem, I guess, is that the value of 0.0 will make the tool vanish from view. But looking a bit further...

In glcanon.py:1501:

  if current_tool is None or current_tool.diameter < self.view_tool_min_dia:
    ...

That condition was previously a comparison with zero (if current_tool is None or current_tool.diameter == 0:). But that condition is no longer triggered when you compare to less than and the value is zero.

My guess is that the condition must be less than or equal (<=) in the comparison.

[BsAtHome]

BTW, in lib/python/rs274/glcanon.py, it just occurred to me that there are addressed two different variables self.tool_min_dia and self.view_tool_min_dia.

The member self.view_tool_min_dia is set to 0.0 on line 521 and never used elsewhere in the file. Grep'ing the member in the entire code base turns up only an assignment to zero and the compare in line 1501.

The member self.tool_min_dia is assigned a value in line 571 and nowhere used in the entire code base.

My conclusion: both the member variable name is wrong (one or the other) and the comparison probably needs to be fixed from < to <=.

[BsAtHome]

This fixes the immediate problem, apparently:

diff --git a/lib/python/rs274/glcanon.py b/lib/python/rs274/glcanon.py
index 8d1716ffe1..bc4c8976e5 100644
--- a/lib/python/rs274/glcanon.py
+++ b/lib/python/rs274/glcanon.py
@@ -568,7 +568,7 @@ class GlCanonDraw:
                     self.max_file_size = temp * 1024 * 1024
 
                 self.disable_cone_scaling = self.inifile.getbool("DISPLAY", "DISABLE_CONE_SCALING", fallback=False)
-                self.tool_min_dia = self.inifile.getreal("DISPLAY", "GCODE_VIEW_TOOL_MIN_DIA", fallback=0.0)
+                self.view_tool_min_dia = self.inifile.getreal("DISPLAY", "GCODE_VIEW_TOOL_MIN_DIA", fallback=0.0)
 
         except:
             # Probably started in an editor so no INI

[BsAtHome]

And, indeed, if the [DISPLAY]GCODE_VIEW_TOOL_MIN_DIA is undefined, then the comparison needs to include zero. The diff to fix the issues is thus as I previously concluded:

diff --git a/lib/python/rs274/glcanon.py b/lib/python/rs274/glcanon.py
index 8d1716ffe1..9cd10472b0 100644
--- a/lib/python/rs274/glcanon.py
+++ b/lib/python/rs274/glcanon.py
@@ -568,7 +568,7 @@ class GlCanonDraw:
                     self.max_file_size = temp * 1024 * 1024
 
                 self.disable_cone_scaling = self.inifile.getbool("DISPLAY", "DISABLE_CONE_SCALING", fallback=False)
-                self.tool_min_dia = self.inifile.getreal("DISPLAY", "GCODE_VIEW_TOOL_MIN_DIA", fallback=0.0)
+                self.view_tool_min_dia = self.inifile.getreal("DISPLAY", "GCODE_VIEW_TOOL_MIN_DIA", fallback=0.0)
 
         except:
             # Probably started in an editor so no INI
@@ -1498,7 +1498,7 @@ class GlCanonDraw:
                 glBlendFunc(GL_ONE, GL_CONSTANT_ALPHA)
 
                 current_tool = self.get_current_tool()
-                if current_tool is None or current_tool.diameter < self.view_tool_min_dia:
+                if current_tool is None or current_tool.diameter <= self.view_tool_min_dia:
                     if self.canon and not self.disable_cone_scaling:
                         g = self.canon
 

[andypugh]

The specific scenario where this is likely to be a problem is when using the tool-table diameter as a wear offset.
In that case I think it would be quite possible to have negative tool diameters. So the comparison should possibly be against the absolute value.
But, also, in that case, you probably want to show the tool cone rather than the (entirely notional) tool anyway, and so <= may be correct.

In any case, the tool should still show if the INI entry is absent, with a cone for zero diameter and a cylinder for nonzero diameter.

[BsAtHome]

... But, also, in that case, you probably want to show the tool cone rather than the (entirely notional) tool anyway, and so <= may be correct.
In any case, the tool should still show if the INI entry is absent, with a cone for zero diameter and a cylinder for nonzero diameter.

The problems is that the current comparison excludes zero by using the < comparison. When the tool min. dia. is not defined in the ini-file, then the value is exactly zero and the cone fails to show. Therefore, the comparison has to be <= if you want to show the cone when no ini-file entry is present (or it is set to zero).