Commit fa58d7a5 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

grfill: removed unused plot parameter: resolution

parent 723104ad
......@@ -3,6 +3,10 @@
* using CDI library version 1.7.1
* Version 1.7.1 released
2016-01-11 Uwe Schulzweida
* grfill: removed unused plot parameter: resolution
2016-01-08 Uwe Schulzweida
* ydaypctl: check of verification date failed (bug fix)
......
......@@ -97,13 +97,14 @@ Example file for 6 colours in RGB format:
@BeginDescription
The operator @bold{grfill} is similar to satellite imaging and shades each cell (pixel) according
to the value of the field at that cell. The following additional parameters are valid for shaded gridfill
operator, in addition to the common plot parameters and shaded contour parameters:
@BeginTable
@bold{Keyname} & @bold{Type} & @bold{Description}
resolution & FLOAT & Number of cells per cm for CELL shading.
@EndTable
to the value of the field at that cell.
@C The following additional parameters are valid for shaded gridfill
@C operator, in addition to the common plot parameters and shaded contour parameters:
@C
@C @BeginTable
@C @bold{Keyname} & @bold{Type} & @bold{Description}
@C resolution & FLOAT & Number of cells per cm for CELL shading.
@C @EndTable
@EndDescription
@EndOperator
......
......@@ -129,62 +129,29 @@ void magplot( const char *plotfile, int operatorID, const char *varname, const c
sep_char = "=";
split_str_count = StringSplitWithSeperator( params[i], sep_char, &split_str );
if( !strcmp( split_str[0],"min" ) )
fprintf(stderr," Min Val %g\n",YMIN );
if ( !strcmp( split_str[0],"min" ) ) fprintf(stderr,"Min Val %g\n",YMIN );
if ( !strcmp( split_str[0],"max" ) ) fprintf(stderr,"Max Val %g\n",YMAX );
// if ( !strcmp( split_str[0],"resolution" ) ) fprintf( stderr,"RESOLUTION %g\n",RESOLUTION );
if ( !strcmp( split_str[0],"colour" ) ) fprintf(stderr,"COLOUR %s\n",COLOUR );
if ( !strcmp( split_str[0],"colour_min" ) ) fprintf(stderr,"COLOUR %s\n",COLOUR_MIN );
if ( !strcmp( split_str[0],"colour_max" ) ) fprintf(stderr,"COLOUR %s\n",COLOUR_MAX );
if ( !strcmp( split_str[0],"interval" ) ) fprintf(stderr,"INTERVAL %f\n",INTERVAL );
if( !strcmp( split_str[0],"count" ) ) fprintf(stderr,"COUNT %d\n",COUNT );
if( !strcmp( split_str[0],"max" ) )
fprintf(stderr,"Max Val %g\n",YMAX );
if( !strcmp( split_str[0],"resolution" ) )
fprintf( stderr,"RESOLUTION %g\n",RESOLUTION );
if( !strcmp( split_str[0],"colour" ) )
fprintf(stderr,"COLOUR %s\n",COLOUR );
if( !strcmp( split_str[0],"colour_min" ) )
fprintf(stderr,"COLOUR %s\n",COLOUR_MIN );
if( !strcmp( split_str[0],"colour_max" ) )
fprintf(stderr,"COLOUR %s\n",COLOUR_MAX );
if( !strcmp( split_str[0],"interval" ) )
fprintf( stderr,"INTERVAL %f\n",INTERVAL );
if( !strcmp( split_str[0],"count" ) )
fprintf( stderr,"COUNT %d\n",COUNT );
if( !strcmp( split_str[0],"list" ) )
if ( !strcmp( split_str[0],"list" ) )
{
for( j = 0; j < split_str_count; j++ )
fprintf( stderr,"LIST %f\n",LEV_LIST[j] );
for( j = 0; j < split_str_count; j++ ) fprintf(stderr,"LIST %f\n",LEV_LIST[j] );
}
if( !strcmp( split_str[0],"thickness" ) )
fprintf( stderr,"THICKNESS %d\n",THICKNESS );
if( !strcmp( split_str[0],"style" ) )
fprintf( stderr,"STYLE %s\n",STYLE );
if( !strcmp( split_str[0],"device" ) )
fprintf( stderr,"DEVICE %s\n",DEVICE );
if( !strcmp( split_str[0],"step_freq" ) )
fprintf( stderr,"STEP_FREQ %d\n",STEP_FREQ );
if( !strcmp( split_str[0],"lat_min" ) )
fprintf(stderr," Lat Min Val %g\n",LAT_MIN );
if( !strcmp( split_str[0],"lat_max" ) )
fprintf(stderr,"Lat Max Val %g\n",LAT_MAX );
if( !strcmp( split_str[0],"lon_min" ) )
fprintf(stderr," Lon Min Val %g\n",LON_MIN );
if( !strcmp( split_str[0],"lon_max" ) )
fprintf(stderr,"Lon Max Val %g\n",LON_MAX );
if( !strcmp( split_str[0],"projection" ) )
fprintf( stderr,"PROJECTION %s\n",PROJECTION );
if ( !strcmp( split_str[0],"thickness" ) ) fprintf(stderr,"THICKNESS %d\n",THICKNESS );
if ( !strcmp( split_str[0],"style" ) ) fprintf(stderr,"STYLE %s\n",STYLE );
if ( !strcmp( split_str[0],"device" ) ) fprintf(stderr,"DEVICE %s\n",DEVICE );
if ( !strcmp( split_str[0],"step_freq" ) ) fprintf(stderr,"STEP_FREQ %d\n",STEP_FREQ );
if ( !strcmp( split_str[0],"lat_min" ) ) fprintf(stderr,"Lat Min Val %g\n",LAT_MIN );
if ( !strcmp( split_str[0],"lat_max" ) ) fprintf(stderr,"Lat Max Val %g\n",LAT_MAX );
if ( !strcmp( split_str[0],"lon_min" ) ) fprintf(stderr,"Lon Min Val %g\n",LON_MIN );
if ( !strcmp( split_str[0],"lon_max" ) ) fprintf(stderr,"Lon Max Val %g\n",LON_MAX );
if ( !strcmp( split_str[0],"projection" ) ) fprintf(stderr,"PROJECTION %s\n",PROJECTION );
Free(split_str);
}
......@@ -496,10 +463,10 @@ void magplot( const char *plotfile, int operatorID, const char *varname, const c
mag_setc( "contour_shade_colour_method", "LIST" );
mag_set1c( "contour_shade_colour_list",( const char ** ) USR_COLOUR_TABLE, USR_COLOUR_COUNT );
}
/*
if( IS_NOT_EQUAL(RESOLUTION, 10.0f) )
mag_setr( "contour_shade_cell_resolution", RESOLUTION );
*/
if( COLOUR_TRIAD )
mag_setc( "contour_shade_colour_direction", COLOUR_TRIAD );
......
......@@ -615,8 +615,11 @@ void *Outputgmt(void *argument)
double range = maxval - minval;
fprintf(stderr, "minval, maxval, meanval, range %g %g %g %g\n", minval, maxval, meanval, range);
fprintf(stderr, "makecpt -T%g/%g/%g -Crainbow > gmt.cpt\n", minval, maxval, range/20);
fprintf(stderr, "psxy -K -Jx0.02id -Rd -L -Cgmt.cpt -m data.gmt > gmtplot.ps\n");
fprintf(stderr, "psxy -K -JQ0/10i -Rd -L -Cgmt.cpt -m data.gmt > gmtplot.ps\n");
// fprintf(stderr, "psxy -K -Jx0.028id -Rd -L -Cgmt.cpt -m data.gmt > gmtplot.ps\n");
// fprintf(stderr, "psxy -K -JN0/10i -Rd -L -Cgmt.cpt -m data.gmt > gmtplot.ps\n");
fprintf(stderr, "pscoast -O -J -R -Dc -W -B30g30 >> gmtplot.ps\n");
fprintf(stderr, "ps2pdf gmtplot.ps\n");
}
for ( i = 0; i < gridsize; i++ )
......
......@@ -4890,11 +4890,7 @@ static const char *MagplotHelp[] = {
" ",
" grfill Shaded gridfill plot",
" The operator grfill is similar to satellite imaging and shades each cell (pixel) according",
" to the value of the field at that cell. The following additional parameters are valid for shaded gridfill",
" operator, in addition to the common plot parameters and shaded contour parameters:",
" ",
" Keyname & Type & Description ",
" resolution & FLOAT & Number of cells per cm for CELL shading.",
" to the value of the field at that cell.",
"",
"PARAMETER",
" params STRING Comma separated list of plot parameters",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment