Skip to content

Commit 31bf08a

Browse files
milliamsmilliams
committed
Rename axis::Axis → axis::ContinuousAxis
1 parent 58aa962 commit 31bf08a

10 files changed

+71
-62
lines changed

‎src/axis.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ impl Range {
2121
}
2222

2323
#[derive(Debug)]
24-
pub struct Axis {
24+
pub struct ContinuousAxis {
2525
range: Range,
2626
ticks: Vec<f64>,
2727
label: String,
2828
}
2929

30-
impl Axis {
31-
/// Constructs a new Axis
32-
pub fn new(lower: f64, upper: f64) -> Axis {
30+
impl ContinuousAxis {
31+
/// Constructs a new ContinuousAxis
32+
pub fn new(lower: f64, upper: f64) -> ContinuousAxis {
3333
let default_max_ticks = 6;
34-
Axis {
34+
ContinuousAxis {
3535
range: Range::new(lower, upper),
3636
ticks: calculate_ticks(lower, upper, default_max_ticks),
3737
label: "".into(),
@@ -71,7 +71,7 @@ pub struct DiscreteAxis {
7171
}
7272

7373
impl DiscreteAxis {
74-
/// Constructs a new Axis
74+
/// Constructs a new ContinuousAxis
7575
pub fn new(ticks: &[String]) -> DiscreteAxis {
7676
DiscreteAxis {
7777
ticks: ticks.into(),

‎src/boxplot.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl<'a> DiscreteRepresentation for BoxPlot<'a> {
132132
fn to_svg(
133133
&self,
134134
x_axis: &axis::DiscreteAxis,
135-
y_axis: &axis::Axis,
135+
y_axis: &axis::ContinuousAxis,
136136
face_width: f64,
137137
face_height: f64,
138138
) -> svg::node::element::Group {
@@ -150,7 +150,7 @@ impl<'a> DiscreteRepresentation for BoxPlot<'a> {
150150
fn to_text(
151151
&self,
152152
x_axis: &axis::DiscreteAxis,
153-
y_axis: &axis::Axis,
153+
y_axis: &axis::ContinuousAxis,
154154
face_width: u32,
155155
face_height: u32,
156156
) -> String {

‎src/function.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ impl Representation for Function {
140140

141141
fn to_svg(
142142
&self,
143-
x_axis: &axis::Axis,
144-
y_axis: &axis::Axis,
143+
x_axis: &axis::ContinuousAxis,
144+
y_axis: &axis::ContinuousAxis,
145145
face_width: f64,
146146
face_height: f64,
147147
) -> svg::node::element::Group {
@@ -157,8 +157,8 @@ impl Representation for Function {
157157

158158
fn to_text(
159159
&self,
160-
x_axis: &axis::Axis,
161-
y_axis: &axis::Axis,
160+
x_axis: &axis::ContinuousAxis,
161+
y_axis: &axis::ContinuousAxis,
162162
face_width: u32,
163163
face_height: u32,
164164
) -> String {

‎src/histogram.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ impl Representation for Histogram {
158158

159159
fn to_svg(
160160
&self,
161-
x_axis: &axis::Axis,
162-
y_axis: &axis::Axis,
161+
x_axis: &axis::ContinuousAxis,
162+
y_axis: &axis::ContinuousAxis,
163163
face_width: f64,
164164
face_height: f64,
165165
) -> svg::node::element::Group {
@@ -168,8 +168,8 @@ impl Representation for Histogram {
168168

169169
fn to_text(
170170
&self,
171-
x_axis: &axis::Axis,
172-
y_axis: &axis::Axis,
171+
x_axis: &axis::ContinuousAxis,
172+
y_axis: &axis::ContinuousAxis,
173173
face_width: u32,
174174
face_height: u32,
175175
) -> String {

‎src/line.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ impl Representation for Line {
127127

128128
fn to_svg(
129129
&self,
130-
x_axis: &axis::Axis,
131-
y_axis: &axis::Axis,
130+
x_axis: &axis::ContinuousAxis,
131+
y_axis: &axis::ContinuousAxis,
132132
face_width: f64,
133133
face_height: f64,
134134
) -> svg::node::element::Group {
@@ -144,8 +144,8 @@ impl Representation for Line {
144144

145145
fn to_text(
146146
&self,
147-
x_axis: &axis::Axis,
148-
y_axis: &axis::Axis,
147+
x_axis: &axis::ContinuousAxis,
148+
y_axis: &axis::ContinuousAxis,
149149
face_width: u32,
150150
face_height: u32,
151151
) -> String {

‎src/representation.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ pub trait Representation {
2424

2525
fn to_svg(
2626
&self,
27-
x_axis: &axis::Axis,
28-
y_axis: &axis::Axis,
27+
x_axis: &axis::ContinuousAxis,
28+
y_axis: &axis::ContinuousAxis,
2929
face_width: f64,
3030
face_height: f64,
3131
) -> svg::node::element::Group;
3232

3333
fn to_text(
3434
&self,
35-
x_axis: &axis::Axis,
36-
y_axis: &axis::Axis,
35+
x_axis: &axis::ContinuousAxis,
36+
y_axis: &axis::ContinuousAxis,
3737
face_width: u32,
3838
face_height: u32,
3939
) -> String;
@@ -52,15 +52,15 @@ pub trait DiscreteRepresentation {
5252
fn to_svg(
5353
&self,
5454
x_axis: &axis::DiscreteAxis,
55-
y_axis: &axis::Axis,
55+
y_axis: &axis::ContinuousAxis,
5656
face_width: f64,
5757
face_height: f64,
5858
) -> svg::node::element::Group;
5959

6060
fn to_text(
6161
&self,
6262
x_axis: &axis::DiscreteAxis,
63-
y_axis: &axis::Axis,
63+
y_axis: &axis::ContinuousAxis,
6464
face_width: u32,
6565
face_height: u32,
6666
) -> String;

‎src/scatter.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ impl Representation for Scatter {
144144

145145
fn to_svg(
146146
&self,
147-
x_axis: &axis::Axis,
148-
y_axis: &axis::Axis,
147+
x_axis: &axis::ContinuousAxis,
148+
y_axis: &axis::ContinuousAxis,
149149
face_width: f64,
150150
face_height: f64,
151151
) -> svg::node::element::Group {
@@ -161,8 +161,8 @@ impl Representation for Scatter {
161161

162162
fn to_text(
163163
&self,
164-
x_axis: &axis::Axis,
165-
y_axis: &axis::Axis,
164+
x_axis: &axis::ContinuousAxis,
165+
y_axis: &axis::ContinuousAxis,
166166
face_width: u32,
167167
face_height: u32,
168168
) -> String {

‎src/svg_render.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ use style;
99
use utils;
1010
use utils::PairWise;
1111

12-
fn value_to_face_offset(value: f64, axis: &axis::Axis, face_size: f64) -> f64 {
12+
fn value_to_face_offset(value: f64, axis: &axis::ContinuousAxis, face_size: f64) -> f64 {
1313
let range = axis.max() - axis.min();
1414
(face_size * (value - axis.min())) / range
1515
}
1616

17-
pub fn draw_x_axis(a: &axis::Axis, face_width: f64) -> node::element::Group {
17+
pub fn draw_x_axis(a: &axis::ContinuousAxis, face_width: f64) -> node::element::Group {
1818
let axis_line = node::element::Line::new()
1919
.set("x1", 0)
2020
.set("y1", 0)
@@ -60,7 +60,7 @@ pub fn draw_x_axis(a: &axis::Axis, face_width: f64) -> node::element::Group {
6060
.add(label)
6161
}
6262

63-
pub fn draw_y_axis(a: &axis::Axis, face_height: f64) -> node::element::Group {
63+
pub fn draw_y_axis(a: &axis::ContinuousAxis, face_height: f64) -> node::element::Group {
6464
let axis_line = node::element::Line::new()
6565
.set("x1", 0)
6666
.set("y1", 0)
@@ -161,8 +161,8 @@ pub fn draw_discrete_x_axis(a: &axis::DiscreteAxis, face_width: f64) -> node::el
161161

162162
pub fn draw_face_points<S>(
163163
s: &[(f64, f64)],
164-
x_axis: &axis::Axis,
165-
y_axis: &axis::Axis,
164+
x_axis: &axis::ContinuousAxis,
165+
y_axis: &axis::ContinuousAxis,
166166
face_width: f64,
167167
face_height: f64,
168168
style: &S,
@@ -228,8 +228,8 @@ where
228228

229229
pub fn draw_face_bars<S>(
230230
h: &histogram::Histogram,
231-
x_axis: &axis::Axis,
232-
y_axis: &axis::Axis,
231+
x_axis: &axis::ContinuousAxis,
232+
y_axis: &axis::ContinuousAxis,
233233
face_width: f64,
234234
face_height: f64,
235235
style: &S,
@@ -265,8 +265,8 @@ where
265265

266266
pub fn draw_face_line<S>(
267267
s: &[(f64, f64)],
268-
x_axis: &axis::Axis,
269-
y_axis: &axis::Axis,
268+
x_axis: &axis::ContinuousAxis,
269+
y_axis: &axis::ContinuousAxis,
270270
face_width: f64,
271271
face_height: f64,
272272
style: &S,
@@ -313,7 +313,7 @@ pub fn draw_face_boxplot<L, S>(
313313
d: &[f64],
314314
label: &L,
315315
x_axis: &axis::DiscreteAxis,
316-
y_axis: &axis::Axis,
316+
y_axis: &axis::ContinuousAxis,
317317
face_width: f64,
318318
face_height: f64,
319319
style: &S,
@@ -395,7 +395,7 @@ mod tests {
395395

396396
#[test]
397397
fn test_value_to_face_offset() {
398-
let axis = axis::Axis::new(-2., 5.);
398+
let axis = axis::ContinuousAxis::new(-2., 5.);
399399
assert_eq!(value_to_face_offset(-2.0, &axis, 14.0), 0.0);
400400
assert_eq!(value_to_face_offset(5.0, &axis, 14.0), 14.0);
401401
assert_eq!(value_to_face_offset(0.0, &axis, 14.0), 4.0);

‎src/text_render.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use style;
1111

1212
// Given a value like a tick label or a bin count,
1313
// calculate how far from the x-axis it should be plotted
14-
fn value_to_axis_cell_offset(value: f64, axis: &axis::Axis, face_cells: u32) -> i32 {
14+
fn value_to_axis_cell_offset(value: f64, axis: &axis::ContinuousAxis, face_cells: u32) -> i32 {
1515
let data_per_cell = (axis.max() - axis.min()) / face_cells as f64;
1616
((value - axis.min()) / data_per_cell).round() as i32
1717
}
@@ -20,7 +20,7 @@ fn value_to_axis_cell_offset(value: f64, axis: &axis::Axis, face_cells: u32) ->
2020
/// the total scale of the axis
2121
/// and the number of face cells to work with,
2222
/// create a mapping of cell offset to tick value
23-
fn tick_offset_map(axis: &axis::Axis, face_width: u32) -> HashMap<i32, f64> {
23+
fn tick_offset_map(axis: &axis::ContinuousAxis, face_width: u32) -> HashMap<i32, f64> {
2424
axis.ticks()
2525
.iter()
2626
.map(|&tick| (value_to_axis_cell_offset(tick, axis, face_width), tick))
@@ -33,7 +33,7 @@ fn tick_offset_map(axis: &axis::Axis, face_width: u32) -> HashMap<i32, f64> {
3333
/// create a mapping of cell offset to bin bound
3434
fn bound_cell_offsets(
3535
hist: &histogram::Histogram,
36-
x_axis: &axis::Axis,
36+
x_axis: &axis::ContinuousAxis,
3737
face_width: u32,
3838
) -> Vec<i32> {
3939
hist.bin_bounds
@@ -130,7 +130,7 @@ fn create_x_axis_labels(x_tick_map: &HashMap<i32, f64>) -> Vec<XAxisLabel> {
130130
ls
131131
}
132132

133-
pub fn render_y_axis_strings(y_axis: &axis::Axis, face_height: u32) -> (String, i32) {
133+
pub fn render_y_axis_strings(y_axis: &axis::ContinuousAxis, face_height: u32) -> (String, i32) {
134134
// Get the strings and offsets we'll use for the y-axis
135135
let y_tick_map = tick_offset_map(y_axis, face_height);
136136

@@ -196,7 +196,7 @@ pub fn render_y_axis_strings(y_axis: &axis::Axis, face_height: u32) -> (String,
196196
(axis_string, longest_y_label_width as i32)
197197
}
198198

199-
pub fn render_x_axis_strings(x_axis: &axis::Axis, face_width: u32) -> (String, i32) {
199+
pub fn render_x_axis_strings(x_axis: &axis::ContinuousAxis, face_width: u32) -> (String, i32) {
200200
// Get the strings and offsets we'll use for the x-axis
201201
let x_tick_map = tick_offset_map(x_axis, face_width as u32);
202202

@@ -277,8 +277,8 @@ pub fn render_x_axis_strings(x_axis: &axis::Axis, face_width: u32) -> (String, i
277277
/// create the strings to be drawn as the face
278278
pub fn render_face_bars(
279279
h: &histogram::Histogram,
280-
x_axis: &axis::Axis,
281-
y_axis: &axis::Axis,
280+
x_axis: &axis::ContinuousAxis,
281+
y_axis: &axis::ContinuousAxis,
282282
face_width: u32,
283283
face_height: u32,
284284
) -> String {
@@ -353,8 +353,8 @@ pub fn render_face_bars(
353353
/// create the strings to be drawn as the face
354354
pub fn render_face_points<S>(
355355
s: &[(f64, f64)],
356-
x_axis: &axis::Axis,
357-
y_axis: &axis::Axis,
356+
x_axis: &axis::ContinuousAxis,
357+
y_axis: &axis::ContinuousAxis,
358358
face_width: u32,
359359
face_height: u32,
360360
style: &S,
@@ -534,7 +534,7 @@ mod tests {
534534
#[test]
535535
fn test_value_to_axis_cell_offset() {
536536
assert_eq!(
537-
value_to_axis_cell_offset(3.0, &axis::Axis::new(5.0, 10.0), 10),
537+
value_to_axis_cell_offset(3.0, &axis::ContinuousAxis::new(5.0, 10.0), 10),
538538
-4
539539
);
540540
}
@@ -576,7 +576,7 @@ mod tests {
576576

577577
#[test]
578578
fn test_render_y_axis_strings() {
579-
let y_axis = axis::Axis::new(0.0, 10.0);
579+
let y_axis = axis::ContinuousAxis::new(0.0, 10.0);
580580

581581
let (y_axis_string, longest_y_label_width) = render_y_axis_strings(&y_axis, 10);
582582

@@ -588,7 +588,7 @@ mod tests {
588588

589589
#[test]
590590
fn test_render_x_axis_strings() {
591-
let x_axis = axis::Axis::new(0.0, 10.0);
591+
let x_axis = axis::ContinuousAxis::new(0.0, 10.0);
592592

593593
let (x_axis_string, start_offset) = render_x_axis_strings(&x_axis, 20);
594594

@@ -603,8 +603,8 @@ mod tests {
603603
fn test_render_face_bars() {
604604
let data = vec![0.3, 0.5, 6.4, 5.3, 3.6, 3.6, 3.5, 7.5, 4.0];
605605
let h = histogram::Histogram::from_slice(&data, 10);
606-
let x_axis = axis::Axis::new(0.3, 7.5);
607-
let y_axis = axis::Axis::new(0., 3.);
606+
let x_axis = axis::ContinuousAxis::new(0.3, 7.5);
607+
let y_axis = axis::ContinuousAxis::new(0., 3.);
608608
let strings = render_face_bars(&h, &x_axis, &y_axis, 20, 10);
609609
assert_eq!(strings.lines().count(), 10);
610610
assert!(strings.lines().all(|s| s.chars().count() == 20));
@@ -636,8 +636,8 @@ mod tests {
636636
(8.5, 3.7),
637637
];
638638
let s = scatter::Scatter::from_slice(&data);
639-
let x_axis = axis::Axis::new(-3.575, 9.075);
640-
let y_axis = axis::Axis::new(-1.735, 5.635);
639+
let x_axis = axis::ContinuousAxis::new(-3.575, 9.075);
640+
let y_axis = axis::ContinuousAxis::new(-1.735, 5.635);
641641
let style = scatter::Style::new();
642642
let strings = render_face_points(&s.data, &x_axis, &y_axis, 20, 10, &style);
643643
assert_eq!(strings.lines().count(), 10);

0 commit comments

Comments
 (0)