Skip to content

Commit 4803cc8

Browse files
authored
Merge branch 'master' into delay_work
2 parents ee90a35 + ef05cb7 commit 4803cc8

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
If this is issue is reporting a bug, please verify that the bug occurs for the latest released version of ControlSystems, see the [version page](https://github.com/JuliaControl/ControlSystems.jl/releases). You can verify your installed version in the REPL using `pkg> st ControlSystems`.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Ping Control Example Plots
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, edited]
6+
7+
jobs:
8+
ping-control-example-plots:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: PR ping ControlExamplePlots
12+
run: |
13+
curl -X POST https://api.github.com/repos/JuliaControl/ControlExamplePlots.jl/dispatches \
14+
-H 'Accept: application/vnd.github.everest-preview+json' \
15+
-u ${{ secrets.ACCESS_TOKEN_BOT }} \
16+
--data '{"event_type": "prupdate", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "pr_number": ${{ github.event.number }} }}'

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "ControlSystems"
22
uuid = "a6e380b2-a6ca-5380-bf3e-84a91bcd477e"
33
authors = ["Dept. Automatic Control, Lund University"]
44
repo = "https://github.com/JuliaControl/ControlSystems.jl.git"
5-
version = "0.5.6"
5+
version = "0.5.8"
66

77
[deps]
88
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -20,12 +20,12 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2020
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2121

2222
[compat]
23-
Colors = "0.9.2, 0.10, 0.11"
23+
Colors = "0.9.2, 0.10, 0.11, 0.12"
2424
DSP = "0.6.1"
2525
DelayDiffEq = "5.6"
2626
IterTools = "1.0"
2727
LaTeXStrings = "1.0"
2828
OrdinaryDiffEq = "5.2"
29-
Plots = "0.24, 0.25, 0.26, 0.27, 0.28"
29+
Plots = "0.24, 0.25, 0.26, 0.27, 0.28, 0.29"
3030
Polynomials = "0.6.0"
3131
julia = "1.0"

src/plotting.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ function getLogTicks(x, minmax)
7575
minor_text_limit = 8
7676
min = ceil(log10(minx))
7777
max = floor(log10(maxx))
78-
major = 10 .^ (min:max)
78+
major = exp10.(min:max)
7979
if Plots.backend() != Plots.GRBackend()
8080
majorText = [latexstring("\$10^{$(round(Int64,i))}\$") for i = min:max]
8181
else
8282
majorText = ["10^{$(round(Int64,i))}" for i = min:max]
8383
end
8484
if max - min < major_minor_limit
85-
minor = [j*10^i for i = (min-1):(max+1) for j = 2:9]
85+
minor = [j*exp10(i) for i = (min-1):(max+1) for j = 2:9]
8686
if Plots.backend() != Plots.GRBackend()
8787
minorText = [latexstring("\$$j\\cdot10^{$(round(Int64,i))}\$") for i = (min-1):(max+1) for j = 2:9]
8888
else
@@ -255,7 +255,7 @@ end
255255
"""`fig = bodeplot(sys, args...)`, `bodeplot(LTISystem[sys1, sys2...], args...; plotphase=true, kwargs...)`
256256
257257
Create a Bode plot of the `LTISystem`(s). A frequency vector `w` can be
258-
optionally provided.
258+
optionally provided. To change the Magnitude scale see `setPlotScale(str)`
259259
260260
`kwargs` is sent as argument to Plots.plot."""
261261
bodeplot
@@ -270,7 +270,7 @@ bodeplot
270270

271271
for (si,s) = enumerate(systems)
272272
mag, phase = bode(s, w)[1:2]
273-
if _PlotScale == "dB"
273+
if _PlotScale == "dB" # Set by setPlotScale(str) globally
274274
mag = 20*log10.(mag)
275275
end
276276

@@ -298,7 +298,7 @@ bodeplot
298298
title --> "Bode plot from: u($j)"
299299
label --> "\$G_{$(si)}\$"
300300
linestyle --> styledict[:l]
301-
color --> styledict[:c]
301+
seriescolor --> styledict[:c]
302302
w, magdata
303303
end
304304
plotphase || continue
@@ -312,7 +312,7 @@ bodeplot
312312
xguide --> "Frequency (rad/s)"
313313
label --> "\$G_{$(si)}\$"
314314
linestyle --> styledict[:l]
315-
color --> styledict[:c]
315+
seriescolor --> styledict[:c]
316316
w, unwrap ? ControlSystems.unwrap(phasedata.*(pi/180)).*(180/pi) : phasedata
317317
end
318318

@@ -721,7 +721,7 @@ pzmap
721721
@recipe function pzmap(p::Pzmap)
722722
systems = p.args[1]
723723
if systems[1].nu + systems[1].ny > 2
724-
warn("pzmap currently only supports SISO systems. Only transfer function from u₁ to y₁ will be shown")
724+
@warn("pzmap currently only supports SISO systems. Only transfer function from u₁ to y₁ will be shown")
725725
end
726726
seriestype := :scatter
727727
title --> "Pole-zero map"
@@ -730,15 +730,15 @@ pzmap
730730
z,p,k = zpkdata(system)
731731
if !isempty(z[1])
732732
@series begin
733-
markershape := :c
733+
markershape --> :c
734734
markersize --> 15.
735735
markeralpha --> 0.5
736736
real(z[1]),imag(z[1])
737737
end
738738
end
739739
if !isempty(p[1])
740740
@series begin
741-
markershape := :x
741+
markershape --> :x
742742
markersize := 15.
743743
real(p[1]),imag(p[1])
744744
end
@@ -749,7 +749,7 @@ pzmap
749749
S,C = sin.(v),cos.(v)
750750
@series begin
751751
linestyle --> :dash
752-
c := :black
752+
linecolor := :black
753753
grid --> true
754754
C,S
755755
end

0 commit comments

Comments
 (0)