Bugfixes

aenarete · Aug 24, 2024 · 6829a5b · 6829a5b
1 parent 74c3960
commit 6829a5b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/examples/multi-channel-many.jl b/examples/multi-channel-many.jl
@@ -9,4 +9,4 @@ Y5 = 0.2*sin.(3T)
 Y6 = 0.2*cos.(3T)
 Y7 = 0.2*sin.(4T)
 plotx(T, Y1, Y2, Y3, Y4, Y5, Y6, Y7; ylabels=["sin","cos", "0.2sin(2T)", "0.2cos(2T)", "0.2sin(3T)", "0.2cos(3T)", "0.2sin(4T)", "0.2cos(4T)"], 
-      yzoom=0.9, fig="multi-channel")
+      yzoom=0.9, fig="multi-channel")
diff --git a/src/ControlPlots.jl b/src/ControlPlots.jl
@@ -15,6 +15,7 @@ mutable struct PlotX
     xlabel
     ylabels
     ysize
+    yzoom
     xlims
     ylims
     ann
@@ -48,7 +49,7 @@ function plotxy(X, Y; xlabel="", ylabel="", xlims=nothing, ylims=nothing, ann=no
         plt.grid(which="major", color="#DDDDDD")
         plt.tight_layout()
     end
-    PlotX(X, Y, nothing, xlabel, ylabel, ysize, xlims, ylims, ann, scatter, fig, 3)
+    PlotX(X, Y, nothing, xlabel, ylabel, ysize, nothing, xlims, ylims, ann, scatter, fig, 3)
 end
 
 function display(P::PlotX)
@@ -57,7 +58,7 @@ function display(P::PlotX)
              scatter=P.scatter, fig=P.fig, ysize=P.ysize, disp=true)
     elseif P.type == 2
         plotx(P.X, P.Y...; xlabel=P.xlabel, ylabels=P.ylabels, labels=P.labels, xlims=P.xlims, ylims=P.ylims, ann=P.ann, 
-              scatter=P.scatter, fig=P.fig, ysize=P.ysize, disp=true)
+              scatter=P.scatter, fig=P.fig, ysize=P.ysize, yzoom=P.yzoom, disp=true)
     elseif P.type == 3
         plotxy(P.X, P.Y; xlabel=P.xlabel, ylabel=P.ylabels, xlims=P.xlims, ylims=P.ylims, ann=P.ann, 
                scatter=P.scatter, fig=P.fig, ysize=P.ysize, disp=true)

diff --git a/src/plot.jl b/src/plot.jl
@@ -46,7 +46,7 @@ function plot(X, Ys::AbstractVector{<:AbstractVector}; xlabel="", ylabel="",
     else
         println("OK")
     end
-    PlotX(X, Ys, labels, xlabel, ylabel, ysize, xlims, ylims, ann, scatter, fig, 4)
+    PlotX(X, Ys, labels, xlabel, ylabel, ysize, nothing, xlims, ylims, ann, scatter, fig, 4)
 end
 
 function plot(X, Y1::AbstractVector{<:AbstractVector}, Y2::AbstractVector{<:Number}; 
@@ -83,7 +83,7 @@ function plot(X, Y1::AbstractVector{<:AbstractVector}, Y2::AbstractVector{<:Numb
         else
             println("OK")
         end
-        PlotX(X, [Y1, Y2], labels, xlabel, ylabels, ysize, xlims, ylims, ann, scatter, fig, 5)
+        PlotX(X, [Y1, Y2], labels, xlabel, ylabels, ysize, nothing, xlims, ylims, ann, scatter, fig, 5)
     end
 
 end
@@ -128,7 +128,7 @@ function plot(X, Y1::AbstractVector{<:Number}, Y2::AbstractVector{<:Number};
     else
         println("OK")
     end
-    PlotX(X, [Y1, Y2], labels, xlabel, ylabels, ysize, xlims, ylims, ann, scatter, fig, 5)
+    PlotX(X, [Y1, Y2], labels, xlabel, ylabels, ysize, nothing, xlims, ylims, ann, scatter, fig, 5)
 end
 
 function plot(Y::AbstractVector{<:Number}; xlabel="", ylabel="", fig="", ysize=14, disp=false)
@@ -165,6 +165,6 @@ function plot(X, Y::AbstractVector{<:Number}; xlabel="", ylabel="", xlims=nothin
         plt.grid(which="major", color="#DDDDDD")
         plt.tight_layout()
     end
-    PlotX(X, Y, nothing, xlabel, ylabel, ysize, xlims, ylims, ann, scatter, fig, 1)
+    PlotX(X, Y, nothing, xlabel, ylabel, ysize, nothing, xlims, ylims, ann, scatter, fig, 1)
 end
 
diff --git a/src/plotx.jl b/src/plotx.jl
@@ -1,5 +1,5 @@
 function plotx(X, Y...; xlabel="time [s]", ylabels=nothing, labels=nothing, xlims=nothing, ylims=nothing, ann=nothing, 
-               scatter=false, fig="", title="", ysize=14, yzoom=0.9, disp=false)
+               scatter=false, fig="", title="", ysize=14, yzoom=1.0, disp=false)
     if disp
         len=length(Y)
         fig_ = plt.figure(fig, figsize=(8, len*2*yzoom))
@@ -58,5 +58,5 @@ function plotx(X, Y...; xlabel="time [s]", ylabels=nothing, labels=nothing, xlim
 
         plt.tight_layout()
     end
-    PlotX(collect(X), Y, labels, xlabel, ylabels, ysize, xlims, ylims, ann, scatter, fig, 2)
+    PlotX(collect(X), Y, labels, xlabel, ylabels, ysize, yzoom, xlims, ylims, ann, scatter, fig, 2)
 end