Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12512] trunk
|
From: <ai...@us...> - 2013-09-22 02:19:33
|
Revision: 12512
http://sourceforge.net/p/plplot/code/12512
Author: airwin
Date: 2013-09-22 02:19:29 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
Style a previous commit.
Modified Paths:
--------------
trunk/bindings/d/plplot.d
trunk/examples/d/x16d.d
Modified: trunk/bindings/d/plplot.d
===================================================================
--- trunk/bindings/d/plplot.d 2013-09-22 02:17:11 UTC (rev 12511)
+++ trunk/bindings/d/plplot.d 2013-09-22 02:19:29 UTC (rev 12512)
@@ -159,40 +159,41 @@
// Routine for drawing continous colour legends
void plcolorbar( PLFLT *p_colorbar_width, PLFLT *p_colorbar_height,
- PLINT opt, PLINT position, PLFLT x, PLFLT y,
- PLFLT x_length, PLFLT y_length,
- PLINT bg_color, PLINT bb_color, PLINT bb_style,
- PLFLT low_cap_color, PLFLT high_cap_color,
- PLINT cont_color, PLFLT cont_width,
- PLINT[] label_opts, string[] label,
- string[] axis_opts,
- PLFLT[] ticks, PLINT[] sub_ticks,
- PLFLT[][] values )
+ PLINT opt, PLINT position, PLFLT x, PLFLT y,
+ PLFLT x_length, PLFLT y_length,
+ PLINT bg_color, PLINT bb_color, PLINT bb_style,
+ PLFLT low_cap_color, PLFLT high_cap_color,
+ PLINT cont_color, PLFLT cont_width,
+ PLINT[] label_opts, string[] label,
+ string[] axis_opts,
+ PLFLT[] ticks, PLINT[] sub_ticks,
+ PLFLT[][] values )
{
- PLINT n_labels = cast(PLINT) label_opts.length;
- PLINT n_axes = cast(PLINT) axis_opts.length;
+ PLINT n_labels = cast(PLINT) label_opts.length;
+ PLINT n_axes = cast(PLINT) axis_opts.length;
PLINT[] n_values = new PLINT[values.length];
- for (size_t i=0; i<values.length;i++) {
+ for ( size_t i = 0; i < values.length; i++ )
+ {
n_values[i] = cast(PLINT) values[i].length;
}
- immutable( char ) * *labelz = array( map!toStringz( label ) ).ptr;
- immutable( char ) * *axis_optsz = array( map!toStringz( axis_opts ) ).ptr;
+ immutable( char ) * *labelz = array( map!toStringz( label ) ).ptr;
+ immutable( char ) * *axis_optsz = array( map!toStringz( axis_opts ) ).ptr;
assert( n_labels == label.length, "plcolorbar(): Arrays must be of same length!" );
assert( n_labels == label_opts.length, "plcolorbar(): Arrays must be of same length!" );
assert( n_axes == axis_opts.length, "plcolorbar(): Arrays must be of same length!" );
assert( n_axes == ticks.length, "plcolorbar(): Arrays must be of same length!" );
assert( n_axes == sub_ticks.length, "plcolorbar(): Arrays must be of same length!" );
- c_plcolorbar(p_colorbar_width, p_colorbar_height,
- opt, position, x, y,
- x_length, y_length,
- bg_color, bb_color, bb_style,
- low_cap_color, high_cap_color,
- cont_color, cont_width,
- n_labels, label_opts.ptr, labelz,
- n_axes, axis_optsz,
- ticks.ptr, sub_ticks.ptr,
- n_values.ptr, convert_array(values) );
+ c_plcolorbar( p_colorbar_width, p_colorbar_height,
+ opt, position, x, y,
+ x_length, y_length,
+ bg_color, bb_color, bb_style,
+ low_cap_color, high_cap_color,
+ cont_color, cont_width,
+ n_labels, label_opts.ptr, labelz,
+ n_axes, axis_optsz,
+ ticks.ptr, sub_ticks.ptr,
+ n_values.ptr, convert_array( values ) );
}
// Draws a contour plot from data in f(nx,ny). Is just a front-end to
@@ -1452,7 +1453,7 @@
//alias c_plscmap1l plscmap1l;
//alias c_plscmap1la plscmap1la;
alias c_plscmap1n plscmap1n;
-alias c_plscmap1_range plscmap1_range;
+alias c_plscmap1_range plscmap1_range;
alias c_plscol0 plscol0;
alias c_plscol0a plscol0a;
alias c_plscolbg plscolbg;
@@ -1814,23 +1815,23 @@
const PL_LEGEND_ROW_MAJOR = 128;
// Flags for plcolorbar
-const PL_COLORBAR_LABEL_LEFT = 1;
-const PL_COLORBAR_LABEL_RIGHT = 2;
-const PL_COLORBAR_LABEL_TOP = 4;
-const PL_COLORBAR_LABEL_BOTTOM = 8;
-const PL_COLORBAR_IMAGE = 16;
-const PL_COLORBAR_SHADE = 32;
-const PL_COLORBAR_GRADIENT = 64;
+const PL_COLORBAR_LABEL_LEFT = 1;
+const PL_COLORBAR_LABEL_RIGHT = 2;
+const PL_COLORBAR_LABEL_TOP = 4;
+const PL_COLORBAR_LABEL_BOTTOM = 8;
+const PL_COLORBAR_IMAGE = 16;
+const PL_COLORBAR_SHADE = 32;
+const PL_COLORBAR_GRADIENT = 64;
const PL_COLORBAR_CAP_NONE = 128;
-const PL_COLORBAR_CAP_LOW = 256;
-const PL_COLORBAR_CAP_HIGH = 512;
-const PL_COLORBAR_SHADE_LABEL = 1024;
-const PL_COLORBAR_ORIENT_RIGHT = 2048;
-const PL_COLORBAR_ORIENT_TOP = 4096;
-const PL_COLORBAR_ORIENT_LEFT = 8192;
+const PL_COLORBAR_CAP_LOW = 256;
+const PL_COLORBAR_CAP_HIGH = 512;
+const PL_COLORBAR_SHADE_LABEL = 1024;
+const PL_COLORBAR_ORIENT_RIGHT = 2048;
+const PL_COLORBAR_ORIENT_TOP = 4096;
+const PL_COLORBAR_ORIENT_LEFT = 8192;
const PL_COLORBAR_ORIENT_BOTTOM = 16384;
-const PL_COLORBAR_BACKGROUND = 32768;
-const PL_COLORBAR_BOUNDING_BOX = 65536;
+const PL_COLORBAR_BACKGROUND = 32768;
+const PL_COLORBAR_BOUNDING_BOX = 65536;
// Routine for drawing discrete line, symbol, or cmap0 legends
@@ -1851,15 +1852,15 @@
// Routine for drawing continous colour legends
void c_plcolorbar( PLFLT *p_colorbar_width, PLFLT *p_colorbar_height,
- PLINT opt, PLINT position, PLFLT x, PLFLT y,
- PLFLT x_length, PLFLT y_length,
- PLINT bg_color, PLINT bb_color, PLINT bb_style,
- PLFLT low_cap_color, PLFLT high_cap_color,
- PLINT cont_color, PLFLT cont_width,
- PLINT n_labels, const PLINT *label_opts, const char **label,
- PLINT n_axes, const char ** axis_opts,
- const PLFLT *ticks, const PLINT *sub_ticks,
- const PLINT *n_values, const PLFLT **values );
+ PLINT opt, PLINT position, PLFLT x, PLFLT y,
+ PLFLT x_length, PLFLT y_length,
+ PLINT bg_color, PLINT bb_color, PLINT bb_style,
+ PLFLT low_cap_color, PLFLT high_cap_color,
+ PLINT cont_color, PLFLT cont_width,
+ PLINT n_labels, const PLINT *label_opts, const char **label,
+ PLINT n_axes, const char ** axis_opts,
+ const PLFLT *ticks, const PLINT *sub_ticks,
+ const PLINT *n_values, const PLFLT **values );
// Sets position of the light source
void c_pllightsource( PLFLT x, PLFLT y, PLFLT z );
Modified: trunk/examples/d/x16d.d
===================================================================
--- trunk/examples/d/x16d.d 2013-09-22 02:17:11 UTC (rev 12511)
+++ trunk/examples/d/x16d.d 2013-09-22 02:19:29 UTC (rev 12512)
@@ -189,26 +189,27 @@
}
// Plot using identity transform
- PLFLT fill_width = 2., cont_width = 0.;
- PLFLT colorbar_width, colorbar_height;
- PLINT cont_color = 0;
+ PLFLT fill_width = 2., cont_width = 0.;
+ PLFLT colorbar_width, colorbar_height;
+ PLINT cont_color = 0;
- const int NUM_AXES = 1;
- string[] axis_opts = [
+ const int NUM_AXES = 1;
+ string[] axis_opts = [
"bcvtm",
];
PLFLT[] values[NUM_AXES];
- for (size_t i = 0; i<NUM_AXES;i++) {
- values[i] = new PLFLT[ns];
+ for ( size_t i = 0; i < NUM_AXES; i++ )
+ {
+ values[i] = new PLFLT[ns];
}
- PLFLT[] axis_ticks = [
+ PLFLT[] axis_ticks = [
0.0,
];
- PLINT[] axis_subticks = [
+ PLINT[] axis_subticks = [
0,
];
const int NUM_LABELS = 1;
- PLINT label_opts[] = [
+ PLINT label_opts[] = [
PL_COLORBAR_LABEL_BOTTOM,
];
string[] labels = [
@@ -233,7 +234,7 @@
plsmaj( 0.0, 0.5 );
plsmin( 0.0, 0.5 );
- values[0] = shedge;
+ values[0] = shedge;
plcolorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
@@ -279,7 +280,7 @@
plsmaj( 0.0, 0.5 );
plsmin( 0.0, 0.5 );
- values[0] = shedge;
+ values[0] = shedge;
plcolorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
@@ -327,7 +328,7 @@
plsmaj( 0.0, 0.5 );
plsmin( 0.0, 0.5 );
- values[0] = shedge;
+ values[0] = shedge;
plcolorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
@@ -376,7 +377,7 @@
plsmaj( 0.0, 0.5 );
plsmin( 0.0, 0.5 );
- values[0] = shedge;
+ values[0] = shedge;
plcolorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
@@ -472,7 +473,7 @@
plsmaj( 0.0, 0.5 );
plsmin( 0.0, 0.5 );
- values[0] = shedge;
+ values[0] = shedge;
plcolorbar( &colorbar_width, &colorbar_height,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL, 0,
0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
