From: <ai...@us...> - 2010-06-01 15:41:39
|
Revision: 11049 http://plplot.svn.sourceforge.net/plplot/?rev=11049&view=rev Author: airwin Date: 2010-06-01 15:41:33 +0000 (Tue, 01 Jun 2010) Log Message: ----------- Style recent changes. Modified Paths: -------------- trunk/bindings/d/plplot.d trunk/drivers/cairo.c trunk/examples/d/x06d.d trunk/examples/d/x07d.d trunk/examples/d/x19d.d trunk/src/plctrl.c Modified: trunk/bindings/d/plplot.d =================================================================== --- trunk/bindings/d/plplot.d 2010-06-01 09:03:53 UTC (rev 11048) +++ trunk/bindings/d/plplot.d 2010-06-01 15:41:33 UTC (rev 11049) @@ -1370,16 +1370,16 @@ alias c_plspage plspage; // alias c_plspal0 plspal0; // alias c_plspal1 plspal1; -alias c_plspause plspause; -alias c_plsstrm plsstrm; -alias c_plssub plssub; -alias c_plssym plssym; -alias c_plstar plstar; +alias c_plspause plspause; +alias c_plsstrm plsstrm; +alias c_plssub plssub; +alias c_plssym plssym; +alias c_plstar plstar; //alias c_plstart plstart; alias c_plstransform plstransform; -alias c_plstripa plstripa; +alias c_plstripa plstripa; //alias c_plstripc plstripc; -alias c_plstripd plstripd; +alias c_plstripd plstripd; //alias c_plstyl plstyl; //alias c_plsurf3d plsurf3d; //alias c_plsurf3dl plsurf3dl; Modified: trunk/drivers/cairo.c =================================================================== --- trunk/drivers/cairo.c 2010-06-01 09:03:53 UTC (rev 11048) +++ trunk/drivers/cairo.c 2010-06-01 15:41:33 UTC (rev 11049) @@ -1824,9 +1824,9 @@ aStream->exit_event_loop = 1; break; case ClientMessage: - // plexit("X Window closed"); - aStream->closed = 1; - aStream->exit_event_loop = 1; + // plexit("X Window closed"); + aStream->closed = 1; + aStream->exit_event_loop = 1; break; case Expose: /* Blit the image again after an expose event, but only for the last Modified: trunk/examples/d/x06d.d =================================================================== --- trunk/examples/d/x06d.d 2010-06-01 09:03:53 UTC (rev 11048) +++ trunk/examples/d/x06d.d 2010-06-01 15:41:33 UTC (rev 11049) @@ -24,53 +24,53 @@ { plfontld( kind_font ); if ( kind_font == 0 ) - maxfont = 1; + maxfont = 1; else maxfont = 4; for ( int font = 0; font < maxfont; font++ ) { - plfont( font + 1 ); + plfont( font + 1 ); - pladv( 0 ); + pladv( 0 ); - /* Set up viewport and window */ - plcol0( 2 ); - plvpor( 0.1, 1.0, 0.1, 0.9 ); - plwind( 0.0, 1.0, 0.0, 1.3 ); - - /* Draw the grid using plbox */ - plbox( "bcg", 0.1, 0, "bcg", 0.1, 0 ); - - /* Write the digits below the frame */ - plcol0( 15 ); - PLFLT[1] x, y; - for ( size_t i = 0; i <= 9; i++ ) - plmtex( "b", 1.5, ( 0.1 * i + 0.05 ), 0.5, format( "%d", i ) ); + /* Set up viewport and window */ + plcol0( 2 ); + plvpor( 0.1, 1.0, 0.1, 0.9 ); + plwind( 0.0, 1.0, 0.0, 1.3 ); - size_t k = 0; - for ( size_t i = 0; i <= 12; i++ ) - { - /* Write the digits to the left of the frame */ - plmtex( "lv", 1.0, ( 1.0 - ( 2 * i + 1 ) / 26.0 ), 1.0, format( "%d", 10 * i ) ); - for ( size_t j = 0; j <= 9; j++ ) - { - x[0] = 0.1 * j + 0.05; - y[0] = 1.25 - 0.1 * i; + /* Draw the grid using plbox */ + plbox( "bcg", 0.1, 0, "bcg", 0.1, 0 ); - /* Display the symbols (plpoin expects that x and y */ - /* are arrays so pass pointers) */ - if ( k < 128 ) - plpoin( x, y, k ); - k = k + 1; - } - } - - if ( kind_font == 0 ) - plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 6 - plpoin symbols (compact)" ); - else - plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 6 - plpoin symbols (extended)" ); - } + /* Write the digits below the frame */ + plcol0( 15 ); + PLFLT[1] x, y; + for ( size_t i = 0; i <= 9; i++ ) + plmtex( "b", 1.5, ( 0.1 * i + 0.05 ), 0.5, format( "%d", i ) ); + + size_t k = 0; + for ( size_t i = 0; i <= 12; i++ ) + { + /* Write the digits to the left of the frame */ + plmtex( "lv", 1.0, ( 1.0 - ( 2 * i + 1 ) / 26.0 ), 1.0, format( "%d", 10 * i ) ); + for ( size_t j = 0; j <= 9; j++ ) + { + x[0] = 0.1 * j + 0.05; + y[0] = 1.25 - 0.1 * i; + + /* Display the symbols (plpoin expects that x and y */ + /* are arrays so pass pointers) */ + if ( k < 128 ) + plpoin( x, y, k ); + k = k + 1; + } + } + + if ( kind_font == 0 ) + plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 6 - plpoin symbols (compact)" ); + else + plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 6 - plpoin symbols (extended)" ); + } } plend(); return 0; Modified: trunk/examples/d/x07d.d =================================================================== --- trunk/examples/d/x07d.d 2010-06-01 09:03:53 UTC (rev 11048) +++ trunk/examples/d/x07d.d 2010-06-01 15:41:33 UTC (rev 11049) @@ -29,7 +29,7 @@ plfontld( 0 ); for ( size_t l = 0; l < 20; l++ ) { - if ( l == 2 ) plfontld( 1 ); + if ( l == 2 ) plfontld( 1 ); pladv( 0 ); /* Set up viewport and window */ @@ -65,10 +65,10 @@ } } - if ( l < 2 ) - plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 7 - PLSYM symbols (compact)" ); - else - plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 7 - PLSYM symbols (extended)" ); + if ( l < 2 ) + plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 7 - PLSYM symbols (compact)" ); + else + plmtex( "t", 1.5, 0.5, 0.5, "PLplot Example 7 - PLSYM symbols (extended)" ); } plend(); return 0; Modified: trunk/examples/d/x19d.d =================================================================== --- trunk/examples/d/x19d.d 2010-06-01 09:03:53 UTC (rev 11048) +++ trunk/examples/d/x19d.d 2010-06-01 15:41:33 UTC (rev 11049) @@ -11,7 +11,6 @@ import plplot; extern ( C ) { - void map_transform( PLFLT x, PLFLT y, PLFLT *xt, PLFLT *yt, PLPointer data ) { Modified: trunk/src/plctrl.c =================================================================== --- trunk/src/plctrl.c 2010-06-01 09:03:53 UTC (rev 11048) +++ trunk/src/plctrl.c 2010-06-01 15:41:33 UTC (rev 11049) @@ -2302,7 +2302,7 @@ void plCloseFile( PLStream *pls ) { - if ( pls->OutFile != NULL) + if ( pls->OutFile != NULL ) { /* Don't close if the output file was stdout */ if ( pls->FileName && strcmp( pls->FileName, "-" ) == 0 ) return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |