Skip to content

Commit 654752e

Browse files
committed
use full path for traits to make them work without additional imports
1 parent 7030c73 commit 654752e

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

plotters/src/style/colors/colormaps.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
use crate::style::{HSLColor, RGBAColor, RGBColor};
22

3-
use num_traits::{Float, FromPrimitive, ToPrimitive};
4-
53
/// Converts scalar values to colors.
64
pub trait ColorMap<ColorType: crate::prelude::Color, FloatType = f32>
75
where
8-
FloatType: Float,
6+
FloatType: num_traits::Float,
97
{
108
/// Takes a scalar value 0.0 <= h <= 1.0 and returns the corresponding color.
119
/// Typically color-scales are named according to which color-type they return.
@@ -81,8 +79,8 @@ macro_rules! calculate_new_color_value(
8179
};
8280
);
8381

84-
fn calculate_relative_difference_index_lower_upper<
85-
FloatType: Float + FromPrimitive + ToPrimitive,
82+
pub fn calculate_relative_difference_index_lower_upper<
83+
FloatType: num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive,
8684
>(
8785
h: FloatType,
8886
min: FloatType,
@@ -106,7 +104,7 @@ fn calculate_relative_difference_index_lower_upper<
106104
macro_rules! implement_color_scale_for_derived_color_map{
107105
($($color_type:ident),+) => {
108106
$(
109-
impl<FloatType: Float + FromPrimitive + ToPrimitive> ColorMap<$color_type, FloatType> for DerivedColorMap<$color_type> {
107+
impl<FloatType: num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive> ColorMap<$color_type, FloatType> for DerivedColorMap<$color_type> {
110108
fn get_color_normalized(&self, h: FloatType, min: FloatType, max: FloatType) -> $color_type {
111109
let (
112110
relative_difference,
@@ -148,9 +146,12 @@ macro_rules! define_colors_from_list_of_values_or_directly{
148146
};
149147
}
150148

149+
#[macro_export]
150+
#[doc(hidden)]
151+
/// Implements the [ColorMap] trait on a given color scale.
151152
macro_rules! implement_linear_interpolation_color_map {
152153
($color_scale_name:ident, $color_type:ident) => {
153-
impl<FloatType: std::fmt::Debug + Float + FromPrimitive + ToPrimitive>
154+
impl<FloatType: std::fmt::Debug + num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive>
154155
ColorMap<$color_type, FloatType> for $color_scale_name
155156
{
156157
fn get_color_normalized(
@@ -184,7 +185,7 @@ macro_rules! implement_linear_interpolation_color_map {
184185
#[doc = "Get color value from `"]
185186
#[doc = stringify!($color_scale_name)]
186187
#[doc = "` by supplying a parameter 0.0 <= h <= 1.0"]
187-
pub fn get_color<FloatType: std::fmt::Debug + Float + FromPrimitive + ToPrimitive>(
188+
pub fn get_color<FloatType: std::fmt::Debug + num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive>(
188189
h: FloatType,
189190
) -> $color_type {
190191
let color_scale = $color_scale_name {};
@@ -195,7 +196,7 @@ macro_rules! implement_linear_interpolation_color_map {
195196
#[doc = stringify!($color_scale_name)]
196197
#[doc = "` by supplying lower and upper bounds min, max and a parameter h where min <= h <= max"]
197198
pub fn get_color_normalized<
198-
FloatType: std::fmt::Debug + Float + FromPrimitive + ToPrimitive,
199+
FloatType: std::fmt::Debug + num_traits::Float + num_traits::FromPrimitive + num_traits::ToPrimitive,
199200
>(
200201
h: FloatType,
201202
min: FloatType,

0 commit comments

Comments
 (0)