Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use $PGPLOT_DEV for demo transform and demo cartography
...for non-MSWindows systems.  This fixes sf bug #409
where systems that don't have all the default PGPLOT
drivers installed cause a die() in the two demos mentioned.
  • Loading branch information
devel-chm committed Sep 18, 2016
1 parent 65fa69d commit e72724f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
11 changes: 8 additions & 3 deletions Demos/Cartography_demo.pm
Expand Up @@ -17,7 +17,8 @@ sub run {
local($PDL::verbose) = 0;

##$ENV{PGPLOT_XW_WIDTH}=0.6;
$ENV{PGPLOT_DEV}=$^O =~ /MSWin32/ ? '/GW' : "/XWIN";
$ENV{PGPLOT_DEV} = $^O =~ /MSWin32/ ? '/GW' :
defined($ENV{PGPLOT_DEV}) ? $ENV{PGPLOT_DEV} : "/XWIN";


unless( PDL->rpiccan('JPEG') ) {
Expand Down Expand Up @@ -77,7 +78,9 @@ act q&
}
print "\n";
$dev = $^O =~ /MSWin/i ? '/GW' : '/xw';
$dev = $^O =~ /MSWin32/ ? '/GW' :
defined($ENV{PGPLOT_DEV}) ? $ENV{PGPLOT_DEV} : "/XW";
# $dev = $^O =~ /MSWin/i ? '/GW' : '/xw';
$w = pgwin(Dev=> $dev, size=>[8,6]);
$w->fits_imag($map, {Title=>"NASA/MODIS Earth Map (Plate Caree)",J=>0});
&;
Expand All @@ -102,7 +105,9 @@ act q&
$w->close; # Close old window
undef $w;
$dev = $^O =~ /MSWin/i ? '/GW' : '/xw';
#$dev = $^O =~ /MSWin/i ? '/GW' : '/xw';
$dev = $^O =~ /MSWin32/ ? '/GW' :
defined($ENV{PGPLOT_DEV}) ? $ENV{PGPLOT_DEV} : "/XW";
$w = pgwin( Dev=> $dev, size=>[8,6], nx=>2, ny=>2 ) ;
sub draw {
Expand Down
9 changes: 6 additions & 3 deletions Demos/Transform_demo.pm
Expand Up @@ -17,7 +17,8 @@ sub run {
local($PDL::verbose) = 0;

##$ENV{PGPLOT_XW_WIDTH}=0.6;
$ENV{PGPLOT_DEV}=$^O =~ /MSWin32/ ? '/GW' : "/XWIN";
$ENV{PGPLOT_DEV} = $^O =~ /MSWin32/ ? '/GW' :
defined($ENV{PGPLOT_DEV}) ? $ENV{PGPLOT_DEV} : "/XWIN";

# try and find m51.fits
$d = File::Spec->catdir( "PDL", "Demos" );
Expand Down Expand Up @@ -97,7 +98,8 @@ act q|
#### Resampling with ->map and no FITS interpretation works in pixel space.
### Create a PGPLOT window, and display the original image
$dev = $^O =~ /MSWin/i ? '/GW' : '/xw';
$dev = $^O =~ /MSWin32/ ? '/GW' :
defined($ENV{PGPLOT_DEV}) ? $ENV{PGPLOT_DEV} : "/XW";
$win = pgwin( dev=> $dev, nx=>2, ny=>2, Charsize=>2, J=>1, Size=>[8,6] );
$win->imag( $m51 , { DrawWedge=>0, Title=>"M51" } );
Expand Down Expand Up @@ -259,7 +261,8 @@ act q|
$s = "M51 closeup ("; $ss=" coords)";
$ps = " (pixels)";
$dev = $^O =~ /MSWin/i ? '/GW' : '/xw';
$dev = $^O =~ /MSWin32/ ? '/GW' :
defined($ENV{PGPLOT_DEV}) ? $ENV{PGPLOT_DEV} : "/XW";
$w1 = pgwin( dev=> $dev, size=>[4,4], charsize=>1.5, justify=>1 );
$w1->imag( $data, 600, 750, { title=>"${s}pixel${ss}",
xtitle=>"X$ps", ytitle=>"Y$ps" } );
Expand Down

0 comments on commit e72724f

Please sign in to comment.