Skip to content

Commit e44f5ae

Browse files
committed
Merge branch 'v0.3-pre' of github.com:38/plotters into v0.3-pre
2 parents 16ff348 + e80bd30 commit e44f5ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+409
-369
lines changed

benches/benches/parallel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const SIZES: &'static [u32] = &[100, 400, 800, 1000, 2000];
99
fn draw_plot(root: &DrawingArea<BitMapBackend, Shift>, pow: f64) {
1010
let mut chart = ChartBuilder::on(root)
1111
.caption(format!("y = x^{}", pow), ("Arial", 30))
12-
.build_ranged(-1.0..1.0, -1.0..1.0)
12+
.build_cartesian_2d(-1.0..1.0, -1.0..1.0)
1313
.unwrap();
1414

1515
chart.configure_mesh().draw().unwrap();

examples/animation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
2929
format!("Koch's Snowflake (n_iter = {})", i),
3030
("sans-serif", 50),
3131
)
32-
.build_ranged(-2.0..2.0, -1.5..1.5)?;
32+
.build_cartesian_2d(-2.0..2.0, -1.5..1.5)?;
3333

3434
let mut snowflake_vertices = {
3535
let mut current: Vec<(f64, f64)> = vec![

examples/area-chart.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
2626
.set_label_area_size(LabelAreaPosition::Left, 60)
2727
.set_label_area_size(LabelAreaPosition::Bottom, 60)
2828
.caption("Area Chart Demo", ("sans-serif", 40))
29-
.build_ranged(0..(data.len() - 1), 0.0..1500.0)?;
29+
.build_cartesian_2d(0..(data.len() - 1), 0.0..1500.0)?;
3030

3131
chart
3232
.configure_mesh()

examples/blit-bitmap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
1515
.margin(5)
1616
.set_label_area_size(LabelAreaPosition::Left, 40)
1717
.set_label_area_size(LabelAreaPosition::Bottom, 40)
18-
.build_ranged(0.0..1.0, 0.0..1.0)?;
18+
.build_cartesian_2d(0.0..1.0, 0.0..1.0)?;
1919

2020
chart.configure_mesh().disable_mesh().draw()?;
2121

examples/boxplot.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
7070
.x_label_area_size(40)
7171
.y_label_area_size(80)
7272
.caption("Ping Boxplot", ("sans-serif", 20).into_font())
73-
.build_ranged(
73+
.build_cartesian_2d(
7474
values_range.start - 1.0..values_range.end + 1.0,
7575
host_list[..].into_segmented(),
7676
)?;
@@ -123,7 +123,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
123123
.x_label_area_size(40)
124124
.y_label_area_size(40)
125125
.caption("Vertical Boxplot", ("sans-serif", 20).into_font())
126-
.build_ranged(
126+
.build_cartesian_2d(
127127
ab_axis[..].into_segmented(),
128128
values_range.start - 10.0..values_range.end + 10.0,
129129
)?;
@@ -138,7 +138,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
138138
.x_label_area_size(40)
139139
.y_label_area_size(40)
140140
.caption("Horizontal Boxplot", ("sans-serif", 20).into_font())
141-
.build_ranged(-30f32..90f32, 0..3)?;
141+
.build_cartesian_2d(-30f32..90f32, 0..3)?;
142142

143143
chart.configure_mesh().light_line_style(&WHITE).draw()?;
144144
chart.draw_series(vec![

examples/chart.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
1616
.margin(5)
1717
.set_all_label_area_size(50)
1818
.caption("Sine and Cosine", ("sans-serif", 40).into_font())
19-
.build_ranged(x_axis.clone(), -1.2f32..1.2f32)?;
19+
.build_cartesian_2d(x_axis.clone(), -1.2f32..1.2f32)?;
2020

2121
cc.configure_mesh()
2222
.x_labels(20)
@@ -74,7 +74,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
7474
format!("y = x^{}", 1 + 2 * idx),
7575
("sans-serif", 40).into_font(),
7676
)
77-
.build_ranged(-1f32..1f32, -1f32..1f32)?;
77+
.build_cartesian_2d(-1f32..1f32, -1f32..1f32)?;
7878
cc.configure_mesh().x_labels(5).y_labels(3).draw()?;
7979

8080
cc.draw_series(LineSeries::new(

examples/console.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ where
160160
.caption("Sine and Cosine", ("sans-serif", (10).percent_height()))
161161
.set_label_area_size(LabelAreaPosition::Left, (5i32).percent_width())
162162
.set_label_area_size(LabelAreaPosition::Bottom, (10i32).percent_height())
163-
.build_ranged(-std::f64::consts::PI..std::f64::consts::PI, -1.2..1.2)?;
163+
.build_cartesian_2d(-std::f64::consts::PI..std::f64::consts::PI, -1.2..1.2)?;
164164

165165
chart
166166
.configure_mesh()

examples/errorbar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
2222
.margin(10)
2323
.set_label_area_size(LabelAreaPosition::Left, 40)
2424
.set_label_area_size(LabelAreaPosition::Bottom, 40)
25-
.build_ranged(-10f64..10f64, -10f64..10f64)?;
25+
.build_cartesian_2d(-10f64..10f64, -10f64..10f64)?;
2626

2727
chart.configure_mesh().draw()?;
2828

examples/histogram.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
1010
.y_label_area_size(40)
1111
.margin(5)
1212
.caption("Histogram Test", ("sans-serif", 50.0).into_font())
13-
.build_ranged((0u32..10u32).into_segmented(), 0u32..10u32)?;
13+
.build_cartesian_2d((0u32..10u32).into_segmented(), 0u32..10u32)?;
1414

1515
chart
1616
.configure_mesh()

examples/mandelbrot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
1111
.margin(20)
1212
.x_label_area_size(10)
1313
.y_label_area_size(10)
14-
.build_ranged(-2.1f64..0.6f64, -1.2f64..1.2f64)?;
14+
.build_cartesian_2d(-2.1f64..0.6f64, -1.2f64..1.2f64)?;
1515

1616
chart
1717
.configure_mesh()

0 commit comments

Comments
 (0)