Fix annotation bug.

Would not skip annotation meant for another strip.
JuliaPlots · Jul 4, 2021 · eb45590 · eb45590 · ma-laforge · Jul 5, 2021
1 parent ff70bdd
commit eb45590
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "InspectDR"
 uuid = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d"
-version = "0.4.2"
+version = "0.4.3"
 
 [deps]
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

diff --git a/src/cairo_annotation.jl b/src/cairo_annotation.jl
@@ -19,6 +19,11 @@ const ALIGN_MAP = Dict{Symbol, CAlignment}(
 )
 
 
+#==Accessors
+===============================================================================#
+skipannot(a::PlotAnnotation, rstrip::RStrip2D) =  (a.strip != rstrip.istrip && a.strip != 0)
+
+
 #==Rendering text annotation
 ===============================================================================#
 function render(ctx::CairoContext, rstrip::RStrip2D, a::TextAnnotation)
@@ -77,17 +82,11 @@ end
 #==Generic rendering algorithm for annotations
 ===============================================================================#
 
-#Basic render function for PlotAnnotation types:
-function render(ctx::CairoContext, rstrip::RStrip2D, a::PlotAnnotation)
-	if 0 == a.strip || a.strip == rstrip.istrip
-		render(ctx, rstrip, a)
-	end
-	return
-end
-
 function render(ctx::CairoContext, rstrip::RStrip2D, alist::Vector{T}) where T<:PlotAnnotation
 	for a in alist
-		render(ctx, rstrip, a)
+		if !skipannot(a, rstrip)
+			render(ctx, rstrip, a)
+		end
 	end
 	return
 end

diff --git a/src/gtk_base.jl b/src/gtk_base.jl
@@ -187,6 +187,11 @@ mutable struct GtkPlot
 end
 
 
+#==Accessors
+===============================================================================#
+skipannot(::CtrlMarkerGroup, rstrip::RStrip2D) =  false
+
+
 #==Helper functions
 ===============================================================================#
 function refresh_title(gplot::GtkPlot)