Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12740] trunk
|
From: <ai...@us...> - 2013-11-22 18:43:02
|
Revision: 12740
http://sourceforge.net/p/plplot/code/12740
Author: airwin
Date: 2013-11-22 18:42:58 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Style previous commits.
Modified Paths:
--------------
trunk/bindings/tk/plframe.c
trunk/bindings/tk-x-plat/plplotter.c
trunk/drivers/ntk.c
trunk/examples/c/x22c.c
trunk/src/plvect.c
Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c 2013-11-22 13:36:22 UTC (rev 12739)
+++ trunk/bindings/tk/plframe.c 2013-11-22 18:42:58 UTC (rev 12740)
@@ -137,7 +137,7 @@
// Support for save operations
- char *SaveFnam; // File name we are currently saving to.
+ char *SaveFnam; // File name we are currently saving to.
// Malloc'ed.
const char **devDesc; // Descriptive names for file-oriented
// devices. Malloc'ed.
Modified: trunk/bindings/tk-x-plat/plplotter.c
===================================================================
--- trunk/bindings/tk-x-plat/plplotter.c 2013-11-22 13:36:22 UTC (rev 12739)
+++ trunk/bindings/tk-x-plat/plplotter.c 2013-11-22 18:42:58 UTC (rev 12740)
@@ -149,12 +149,12 @@
// Support for save operations
- char *SaveFnam; // File name we are currently saving to.
+ char *SaveFnam; // File name we are currently saving to.
// Malloc'ed.
- const char **devDesc; // Descriptive names for file-oriented
- // devices. Malloc'ed.
- const char **devName; // Keyword names of file-oriented devices.
- // Malloc'ed.
+ const char **devDesc; // Descriptive names for file-oriented
+ // devices. Malloc'ed.
+ const char **devName; // Keyword names of file-oriented devices.
+ // Malloc'ed.
// Used in selecting & modifying plot or device area
Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c 2013-11-22 13:36:22 UTC (rev 12739)
+++ trunk/drivers/ntk.c 2013-11-22 18:42:58 UTC (rev 12740)
@@ -115,7 +115,7 @@
//
sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
if ( Tcl_Eval( interp, scmd ) != TCL_OK )
- fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+ fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
}
}
@@ -239,10 +239,10 @@
if ( pls->geometry != NULL )
sscanf( pls->geometry, "%dx%d", &xmax, &ymax );
-/* if ( pls->plwindow != NULL )
- strcpy( base, pls->plwindow );
- else */
- strcpy( base, ".plf" ); // default frame containing the canvas
+// if ( pls->plwindow != NULL )
+// strcpy( base, pls->plwindow );
+// else
+ strcpy( base, ".plf" ); // default frame containing the canvas
interp = Tcl_CreateInterp();
@@ -264,7 +264,7 @@
sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
if ( Tcl_Eval( interp, cmd ) != TCL_OK )
{
- fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+ fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
plexit( "No such tk server." );
}
}
@@ -301,7 +301,7 @@
// Set up device parameters
Tcl_Eval( interp, "tk scaling" ); // pixels per mm
- ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
+ ppm = (PLFLT) atof( Tcl_GetStringResult( interp ) ) / ( 25.4 / 72. );
plP_setpxl( ppm, ppm );
plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
@@ -373,11 +373,11 @@
{
tk_cmd( "update" );
tk_cmd( "info exists keypress" );
- sscanf( Tcl_GetStringResult(interp), "%d", &st );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &st );
}
tk_cmd( "set keypress" );
- sscanf( Tcl_GetStringResult(interp), "%d", &key );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &key );
//fprintf(stderr,"\n%d\n", key);fflush(stderr);
tk_cmd( "unset keypress" );
st = 0;
@@ -435,7 +435,7 @@
{
tk_cmd( "update" );
tk_cmd( "winfo exists $plf.f2.c$ccanv" );
- sscanf( Tcl_GetStringResult(interp), "%d", &st );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &st );
}
st = 0;
// this give a "Segmentation fault", even after checking for the canvas!
@@ -452,16 +452,16 @@
{
tk_cmd( "update" );
tk_cmd( "info exists xloc" );
- sscanf( Tcl_GetStringResult(interp), "%d", &st );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &st );
}
tk_cmd( "set xloc" );
- sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &gin.pX );
tk_cmd( "set yloc" );
- sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &gin.pY );
tk_cmd( "set bloc" );
- sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &gin.button );
tk_cmd( "set sloc" );
- sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
+ sscanf( Tcl_GetStringResult( interp ), "%d", &gin.state );
gin.dX = (PLFLT) gin.pX / xmax;
gin.dY = 1. - (PLFLT) gin.pY / ymax;
Modified: trunk/examples/c/x22c.c
===================================================================
--- trunk/examples/c/x22c.c 2013-11-22 13:36:22 UTC (rev 12739)
+++ trunk/examples/c/x22c.c 2013-11-22 18:42:58 UTC (rev 12740)
@@ -434,9 +434,9 @@
constriction2();
- // Reset arrow style to the default by passing two
+ // Reset arrow style to the default by passing two
// NULL arrays
- plsvect( NULL, NULL, 0, 0);
+ plsvect( NULL, NULL, 0, 0 );
potential();
Modified: trunk/src/plvect.c
===================================================================
--- trunk/src/plvect.c 2013-11-22 13:36:22 UTC (rev 12739)
+++ trunk/src/plvect.c 2013-11-22 18:42:58 UTC (rev 12740)
@@ -39,7 +39,7 @@
void
c_plsvect( const PLFLT *arrowx, const PLFLT *arrowy, PLINT npts, PLINT fill )
{
- int i;
+ int i;
PLFLT def_arrow_x[6] = { -0.5, 0.5, 0.3, 0.5, 0.3, 0.5 };
PLFLT def_arrow_y[6] = { 0.0, 0.0, 0.2, 0.0, -0.2, 0.0 };
@@ -49,12 +49,12 @@
free_mem( plsc->arrow_y );
// Reset default arrow if null pointers are passed.
- if (arrowx == NULL && arrowy == NULL)
+ if ( arrowx == NULL && arrowy == NULL )
{
- arrowx = def_arrow_x;
- arrowy = def_arrow_y;
- npts = 6;
- fill = 0;
+ arrowx = def_arrow_x;
+ arrowy = def_arrow_y;
+ npts = 6;
+ fill = 0;
}
if ( ( ( plsc->arrow_x = (PLFLT *) malloc( (size_t) npts * sizeof ( PLFLT ) ) ) == NULL ) ||
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
