Plotting with feh in macOS failes with --magick-timeout,

so replace it by --conversion-timeout, which does not do
in Linux or Cygwin.
This commit is contained in:
Holger Vogt 2021-03-17 12:11:01 +01:00
parent 9f6d550837
commit 5b3007e06a
4 changed files with 40 additions and 14 deletions

View File

@ -34,13 +34,17 @@ set nolegend
* only the gnuplot window, no gnuplot files
gnuplot temp vss#branch vss2#branch title 'Drain current versus drain voltage' xlabel 'Drain voltage / V' ylabel 'Drain current / µA'
* for MS Windows only
* MS Windows
if $oscompiled = 1 | $oscompiled = 8
shell Start c:\"program files"\irfanview\i_view64.exe plot_1.png
else
if $oscompiled = 7
* macOS (using feh from homebrew)
shell feh --conversion-timeout 1 plot_1.png &
else
* for CYGWIN, Linux
shell feh --magick-timeout 1 plot_1.png &
shell feh --magick-timeout 1 plot_1.png &
end
end
.endc

View File

@ -51,9 +51,15 @@ if $oscompiled = 1 | $oscompiled = 8
shell Start plot_10.svg
shell Start plot_11.svg
else
if $oscompiled = 7
* macOS (using feh from homebrew)
shell feh --conversion-timeout 1 plot_10.svg &
shell feh --conversion-timeout 1 plot_11.svg &
else
* for CYGWIN, Linux
shell feh --magick-timeout 1 plot_10.svg &
shell feh --magick-timeout 1 plot_11.svg &
shell feh --magick-timeout 1 plot_10.svg &
shell feh --magick-timeout 1 plot_11.svg &
end
end
.endc

View File

@ -81,13 +81,23 @@ if $oscompiled = 1 | $oscompiled = 8
shell Start plot_4.svg
shell Start plot_5.svg
else
if $oscompiled = 7
* macOS (using feh and ImageMagick from homebrew)
shell feh --conversion-timeout 1 plot_0.svg &
shell feh --conversion-timeout 1 plot_1.svg &
shell feh --conversion-timeout 1 plot_2.svg &
shell feh --conversion-timeout 1 plot_3.svg &
shell feh --conversion-timeout 1 plot_4.svg &
shell feh --conversion-timeout 1 plot_5.svg &
else
* for CYGWIN, Linux
shell feh --magick-timeout 1 plot_0.svg &
shell feh --magick-timeout 1 plot_1.svg &
shell feh --magick-timeout 1 plot_2.svg &
shell feh --magick-timeout 1 plot_3.svg &
shell feh --magick-timeout 1 plot_4.svg &
shell feh --magick-timeout 1 plot_5.svg &
shell feh --magick-timeout 1 plot_0.svg &
shell feh --magick-timeout 1 plot_1.svg &
shell feh --magick-timeout 1 plot_2.svg &
shell feh --magick-timeout 1 plot_3.svg &
shell feh --magick-timeout 1 plot_4.svg &
shell feh --magick-timeout 1 plot_5.svg &
end
end
.endc

View File

@ -66,10 +66,16 @@ hardcopy plot_5.svg vss#branch title 'Drain current versus drain voltage' xlabel
if $oscompiled = 1 | $oscompiled = 8
shell Start /B plot_4.svg
shell Start /B plot_5.svg
* for CYGWIN, Linux
else
shell feh --magick-timeout 1 plot_4.svg &
shell feh --magick-timeout 1 plot_5.svg &
if $oscompiled = 7
* macOS (using feh from homebrew)
shell feh --conversion-timeout 1 plot_4.svg &
shell feh --conversion-timeout 1 plot_5.svg &
* for CYGWIN, Linux
else
shell feh --magick-timeout 1 plot_4.svg &
shell feh --magick-timeout 1 plot_5.svg &
end
end
.endc